diff --git a/src/api.ts b/src/api.ts
index c055432..f2f2084 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -29,11 +29,13 @@ import {
   DatasetExperimentItem,
   DatasetItem,
   DatasetType,
+  Environment,
   Maybe,
   OmitUtils,
   PaginatedResponse,
   Prompt,
   Score,
+  ScoreConstructor,
   Step,
   StepType,
   Thread,
@@ -57,6 +59,7 @@ const stepFields = `
     input
     output
     metadata
+    environment
     scores {
       id
       type
@@ -107,11 +110,14 @@ const threadFields = `
         id
         identifier
         metadata
-    }
-    steps {
-        ${stepFields}
     }`;
 
+const threadFieldsWithSteps = `
+${threadFields}
+steps {
+  ${stepFields}
+}`;
+
 /**
  * Serializes the step object with a suffix ID to each key.
  *
@@ -236,7 +242,7 @@ function ingestStepsQueryBuilder(steps: Step[]) {
     `;
 }
 
-function createScoresFieldsBuilder(scores: Score[]) {
+function createScoresFieldsBuilder(scores: ScoreConstructor[]) {
   let generated = '';
   for (let id = 0; id < scores.length; id++) {
     generated += `$name_${id}: String!
@@ -253,7 +259,7 @@ function createScoresFieldsBuilder(scores: Score[]) {
   return generated;
 }
 
-function createScoresArgsBuilder(scores: Score[]) {
+function createScoresArgsBuilder(scores: ScoreConstructor[]) {
   let generated = '';
   for (let id = 0; id < scores.length; id++) {
     generated += `
@@ -280,7 +286,7 @@ function createScoresArgsBuilder(scores: Score[]) {
   return generated;
 }
 
-function createScoresQueryBuilder(scores: Score[]) {
+function createScoresQueryBuilder(scores: ScoreConstructor[]) {
   return `
     mutation CreateScores(${createScoresFieldsBuilder(scores)}) {
       ${createScoresArgsBuilder(scores)}
@@ -353,7 +359,7 @@ type CreateAttachmentParams = {
 
 export class API {
   /** @ignore */
-  private client: LiteralClient;
+  public client: LiteralClient;
   /** @ignore */
   private apiKey: string;
   /** @ignore */
@@ -363,28 +369,33 @@ export class API {
   /** @ignore */
   private restEndpoint: string;
   /** @ignore */
+  public environment: Environment | undefined;
+  /** @ignore */
   public disabled: boolean;
 
   /** @ignore */
   constructor(
     client: LiteralClient,
-    apiKey: string,
-    url: string,
+    apiKey?: string,
+    url?: string,
+    environment?: Environment,
     disabled?: boolean
   ) {
     this.client = client;
-    this.apiKey = apiKey;
-    this.url = url;
-    this.graphqlEndpoint = `${url}/api/graphql`;
-    this.restEndpoint = `${url}/api`;
-    this.disabled = !!disabled;
 
-    if (!this.apiKey) {
+    if (!apiKey) {
       throw new Error('LITERAL_API_KEY not set');
     }
-    if (!this.url) {
+    if (!url) {
       throw new Error('LITERAL_API_URL not set');
     }
+
+    this.apiKey = apiKey;
+    this.url = url;
+    this.environment = environment;
+    this.graphqlEndpoint = `${url}/api/graphql`;
+    this.restEndpoint = `${url}/api`;
+    this.disabled = !!disabled;
   }
 
   /** @ignore */
@@ -392,8 +403,9 @@ export class API {
     return {
       'Content-Type': 'application/json',
       'x-api-key': this.apiKey,
-      'x-client-name': 'js-literal-client',
-      'x-client-version': version
+      'x-client-name': 'ts-literal-client',
+      'x-client-version': version,
+      'x-env': this.environment
     };
   }
 
@@ -871,7 +883,6 @@ export class API {
    * @param options.name - The name of the thread. (Optional)
    * @param options.metadata - Additional metadata for the thread as a key-value pair object. (Optional)
    * @param options.participantId - The unique identifier of the participant. (Optional)
-   * @param options.environment - The environment where the thread is being upserted. (Optional)
    * @param options.tags - An array of tags associated with the thread. (Optional)
    * @returns The upserted thread object.
    */
@@ -880,7 +891,6 @@ export class API {
     name?: Maybe<string>;
     metadata?: Maybe<Record<string, any>>;
     participantId?: Maybe<string>;
-    environment?: Maybe<string>;
     tags?: Maybe<string[]>;
   }): Promise<CleanThreadFields>;
 
@@ -892,7 +902,6 @@ export class API {
    * @param name - The name of the thread. (Optional)
    * @param metadata - Additional metadata for the thread as a key-value pair object. (Optional)
    * @param participantId - The unique identifier of the participant. (Optional)
-   * @param environment - The environment where the thread is being upserted. (Optional)
    * @param tags - An array of tags associated with the thread. (Optional)
    * @returns The upserted thread object.
    */
@@ -901,7 +910,6 @@ export class API {
     name?: Maybe<string>,
     metadata?: Maybe<Record<string, any>>,
     participantId?: Maybe<string>,
-    environment?: Maybe<string>,
     tags?: Maybe<string[]>
   ): Promise<CleanThreadFields>;
 
@@ -910,7 +918,6 @@ export class API {
     name?: Maybe<string>,
     metadata?: Maybe<Record<string, any>>,
     participantId?: Maybe<string>,
-    environment?: Maybe<string>,
     tags?: Maybe<string[]>
   ): Promise<CleanThreadFields> {
     let threadId = threadIdOrOptions;
@@ -919,7 +926,6 @@ export class API {
       name = threadIdOrOptions.name;
       metadata = threadIdOrOptions.metadata;
       participantId = threadIdOrOptions.participantId;
-      environment = threadIdOrOptions.environment;
       tags = threadIdOrOptions.tags;
     }
 
@@ -929,7 +935,6 @@ export class API {
       $name: String,
       $metadata: Json,
       $participantId: String,
-      $environment: String,
       $tags: [String!],
   ) {
       upsertThread(
@@ -937,7 +942,6 @@ export class API {
           name: $name
           metadata: $metadata
           participantId: $participantId
-          environment: $environment
           tags: $tags
       ) {
         ${threadFields}
@@ -950,7 +954,6 @@ export class API {
       name,
       metadata,
       participantId,
-      environment,
       tags
     };
 
@@ -1010,7 +1013,7 @@ export class API {
             edges {
                 cursor
                 node {
-                    ${threadFields}
+                    ${threadFieldsWithSteps}
                 }
             }
         }
@@ -1038,7 +1041,7 @@ export class API {
     const query = `
     query GetThread($id: String!) {
         threadDetail(id: $id) {
-            ${threadFields}
+            ${threadFieldsWithSteps}
         }
     }
     `;
@@ -1815,12 +1818,12 @@ export class API {
 
   public async createExperiment(datasetExperiment: {
     name: string;
-    datasetId: string;
+    datasetId?: string;
     promptId?: string;
     params?: Record<string, any> | Array<Record<string, any>>;
   }) {
     const query = `
-      mutation CreateDatasetExperiment($name: String!, $datasetId: String! $promptId: String, $params: Json) {
+      mutation CreateDatasetExperiment($name: String!, $datasetId: String $promptId: String, $params: Json) {
         createDatasetExperiment(name: $name, datasetId: $datasetId, promptId: $promptId, params: $params) {
           id
         }
@@ -1840,16 +1843,18 @@ export class API {
   public async createExperimentItem({
     datasetExperimentId,
     datasetItemId,
+    experimentRunId,
     input,
     output,
     scores
   }: DatasetExperimentItem) {
     const query = `
-      mutation CreateDatasetExperimentItem($datasetExperimentId: String!, $datasetItemId: String!, $input: Json, $output: Json) {
-        createDatasetExperimentItem(datasetExperimentId: $datasetExperimentId, datasetItemId: $datasetItemId, input: $input, output: $output) {
+      mutation CreateDatasetExperimentItem($datasetExperimentId: String!, $datasetItemId: String, $experimentRunId: String, $input: Json, $output: Json) {
+        createDatasetExperimentItem(datasetExperimentId: $datasetExperimentId, datasetItemId: $datasetItemId, experimentRunId: $experimentRunId, input: $input, output: $output) {
           id
           input
           output
+          experimentRunId
         }
       }
     `;
@@ -1857,6 +1862,7 @@ export class API {
     const result = await this.makeGqlCall(query, {
       datasetExperimentId,
       datasetItemId,
+      experimentRunId,
       input,
       output
     });
@@ -1865,7 +1871,7 @@ export class API {
       scores.map((score) => {
         score.datasetExperimentItemId =
           result.data.createDatasetExperimentItem.id;
-        return score;
+        return new Score(score);
       })
     );
 
diff --git a/src/index.ts b/src/index.ts
index 5f44b65..da2bf51 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -3,7 +3,14 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 import { API } from './api';
 import instrumentation from './instrumentation';
 import openai from './openai';
-import { Step, StepConstructor, Thread, ThreadConstructor } from './types';
+import {
+  Environment,
+  ExperimentRun,
+  Step,
+  StepConstructor,
+  Thread,
+  ThreadConstructor
+} from './types';
 
 export * from './types';
 export * from './generation';
@@ -13,6 +20,7 @@ export type * from './instrumentation';
 type StoredContext = {
   currentThread: Thread | null;
   currentStep: Step | null;
+  currentExperimentRunId?: string | null;
 };
 
 const storage = new AsyncLocalStorage<StoredContext>();
@@ -23,7 +31,17 @@ export class LiteralClient {
   instrumentation: ReturnType<typeof instrumentation>;
   store: AsyncLocalStorage<StoredContext> = storage;
 
-  constructor(apiKey?: string, apiUrl?: string, disabled?: boolean) {
+  constructor({
+    apiKey,
+    apiUrl,
+    environment,
+    disabled
+  }: {
+    apiKey?: string;
+    apiUrl?: string;
+    environment?: Environment;
+    disabled?: boolean;
+  } = {}) {
     if (!apiKey) {
       apiKey = process.env.LITERAL_API_KEY;
     }
@@ -32,7 +50,7 @@ export class LiteralClient {
       apiUrl = process.env.LITERAL_API_URL || 'https://cloud.getliteral.ai';
     }
 
-    this.api = new API(this, apiKey!, apiUrl!, disabled);
+    this.api = new API(this, apiKey, apiUrl, environment, disabled);
     this.openai = openai(this);
     this.instrumentation = instrumentation(this);
   }
@@ -49,6 +67,14 @@ export class LiteralClient {
     return this.step({ ...data, type: 'run' });
   }
 
+  experimentRun(data?: Omit<StepConstructor, 'type' | 'name'>) {
+    return new ExperimentRun(this, {
+      ...(data || {}),
+      name: 'Experiment Run',
+      type: 'run'
+    });
+  }
+
   _currentThread(): Thread | null {
     const store = storage.getStore();
 
diff --git a/src/instrumentation/openai.ts b/src/instrumentation/openai.ts
index 0f04a68..f5edba6 100644
--- a/src/instrumentation/openai.ts
+++ b/src/instrumentation/openai.ts
@@ -508,6 +508,7 @@ const processOpenAIOutput = async (
         outputTokenCount: output.usage?.completion_tokens,
         tokenCount: output.usage?.total_tokens
       });
+
       if (parent) {
         const step = parent.step({
           name: generation.model || 'openai',
diff --git a/src/types.ts b/src/types.ts
index 536f0d3..6065566 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -14,6 +14,8 @@ export type Maybe<T> = T | null | undefined;
 
 export type OmitUtils<T> = Omit<T, keyof Utils>;
 
+export type Environment = 'dev' | 'staging' | 'prod' | 'experiment';
+
 export type PageInfo = {
   hasNextPage: boolean;
   startCursor: string;
@@ -78,11 +80,7 @@ export class Utils {
 
 export type ScoreType = 'HUMAN' | 'AI';
 
-/**
- * Represents a score entity with properties to track various aspects of scoring.
- * It extends the `Utils` class for serialization capabilities.
- */
-export class Score extends Utils {
+class ScoreFields extends Utils {
   id?: Maybe<string>;
   stepId?: Maybe<string>;
   generationId?: Maybe<string>;
@@ -93,8 +91,16 @@ export class Score extends Utils {
   scorer?: Maybe<string>;
   comment?: Maybe<string>;
   tags?: Maybe<string[]>;
+}
+
+export type ScoreConstructor = OmitUtils<ScoreFields>;
 
-  constructor(data: OmitUtils<Score>) {
+/**
+ * Represents a score entity with properties to track various aspects of scoring.
+ * It extends the `Utils` class for serialization capabilities.
+ */
+export class Score extends ScoreFields {
+  constructor(data: ScoreConstructor) {
     super();
     Object.assign(this, data);
   }
@@ -200,7 +206,6 @@ export class Thread extends ThreadFields {
       name: this.name,
       metadata: this.metadata,
       participantId: this.participantId,
-      environment: this.environment,
       tags: this.tags
     });
     return this;
@@ -219,8 +224,14 @@ export class Thread extends ThreadFields {
       | ((output: Output) => ThreadConstructor)
       | ((output: Output) => Promise<ThreadConstructor>)
   ) {
+    const currentStore = this.client.store.getStore();
+
     const output = await this.client.store.run(
-      { currentThread: this, currentStep: null },
+      {
+        currentThread: this,
+        currentExperimentRunId: currentStore?.currentExperimentRunId ?? null,
+        currentStep: null
+      },
       () => cb(this)
     );
 
@@ -262,6 +273,7 @@ class StepFields extends Utils {
   createdAt?: Maybe<string>;
   startTime?: Maybe<string>;
   id?: Maybe<string>;
+  environment?: Maybe<Environment>;
   error?: Maybe<string | Record<string, any>>;
   input?: Maybe<Record<string, any>>;
   output?: Maybe<Record<string, any>>;
@@ -379,7 +391,6 @@ export class Step extends StepFields {
     if (this.api.disabled) {
       return this;
     }
-    await new Promise((resolve) => setTimeout(resolve, 1));
     if (!this.endTime) {
       this.endTime = new Date().toISOString();
     }
@@ -405,7 +416,11 @@ export class Step extends StepFields {
     const currentStore = this.client.store.getStore();
 
     const output = await this.client.store.run(
-      { currentThread: currentStore?.currentThread ?? null, currentStep: this },
+      {
+        currentThread: currentStore?.currentThread ?? null,
+        currentExperimentRunId: currentStore?.currentExperimentRunId ?? null,
+        currentStep: this
+      },
       () => cb(this)
     );
 
@@ -441,6 +456,64 @@ export class Step extends StepFields {
   }
 }
 
+/**
+ * Represents a step in a process or workflow, extending the fields and methods from StepFields.
+ */
+export class ExperimentRun extends Step {
+  api: API;
+  client: LiteralClient;
+
+  /**
+   * Constructs a new ExperimentRun instance.
+   * @param api The API instance to be used for sending and managing steps.
+   * @param data The initial data for the step, excluding utility properties.
+   */
+  constructor(
+    client: LiteralClient,
+    data: StepConstructor,
+    ignoreContext?: true
+  ) {
+    super(client, data, ignoreContext);
+    this.client = client;
+    this.api = client.api;
+  }
+
+  async wrap<Output>(
+    cb: (step: Step) => Output | Promise<Output>,
+    updateStep?:
+      | Partial<StepConstructor>
+      | ((output: Output) => Partial<StepConstructor>)
+      | ((output: Output) => Promise<Partial<StepConstructor>>)
+  ) {
+    const originalEnvironment = this.api.environment;
+    this.api.environment = 'experiment';
+
+    const currentStore = this.client.store.getStore();
+    const output: Output = await this.client.store.run(
+      {
+        currentThread: currentStore?.currentThread ?? null,
+        currentStep: this,
+        currentExperimentRunId: this.id ?? null
+      },
+      async () => {
+        try {
+          const output = await super.wrap(cb, updateStep);
+          return output;
+        } finally {
+          // Clear the currentExperimentRunId after execution
+          const updatedStore = this.client.store.getStore();
+          if (updatedStore) {
+            updatedStore.currentExperimentRunId = null;
+          }
+        }
+      }
+    );
+
+    this.api.environment = originalEnvironment;
+    return output;
+  }
+}
+
 /**
  * Represents a user with optional metadata and identifier.
  */
@@ -631,8 +704,9 @@ export class DatasetItem extends Utils {
 class DatasetExperimentItemFields extends Utils {
   id?: string;
   datasetExperimentId!: string;
-  datasetItemId!: string;
-  scores!: Score[];
+  datasetItemId?: string;
+  experimentRunId?: string;
+  scores!: ScoreConstructor[];
   input?: Record<string, any>;
   output?: Record<string, any>;
 }
@@ -641,7 +715,7 @@ export class DatasetExperiment extends Utils {
   id!: string;
   createdAt!: string;
   name!: string;
-  datasetId!: string;
+  datasetId?: string;
   promptId?: string;
   api: API;
   params!: Record<string, any> | Array<Record<string, any>>;
@@ -662,9 +736,13 @@ export class DatasetExperiment extends Utils {
       'id' | 'datasetExperimentId'
     >
   ) {
+    const currentStore = this.api.client.store.getStore();
+    const experimentRunId = currentStore?.currentExperimentRunId;
+
     const datasetExperimentItem = new DatasetExperimentItem({
       ...itemFields,
-      datasetExperimentId: this.id
+      datasetExperimentId: this.id,
+      ...(experimentRunId && { experimentRunId })
     });
 
     const item = await this.api.createExperimentItem(datasetExperimentItem);
diff --git a/tests/api.test.ts b/tests/api.test.ts
index a04519e..34a09cb 100644
--- a/tests/api.test.ts
+++ b/tests/api.test.ts
@@ -14,7 +14,7 @@ describe('End to end tests for the SDK', function () {
       throw new Error('Missing environment variables');
     }
 
-    client = new LiteralClient(apiKey, url);
+    client = new LiteralClient({ apiKey, apiUrl: url });
   });
 
   it('should test user', async function () {
@@ -97,7 +97,6 @@ describe('End to end tests for the SDK', function () {
       'name',
       { foo: 'bar' },
       undefined,
-      undefined,
       ['hello']
     );
 
@@ -112,7 +111,6 @@ describe('End to end tests for the SDK', function () {
       'test',
       { foo: 'baz' },
       undefined,
-      undefined,
       ['hello:world']
     );
     expect(updatedThread.tags).toStrictEqual(['hello:world']);
diff --git a/tests/attachments.test.ts b/tests/attachments.test.ts
index 8877b8d..514f4e4 100644
--- a/tests/attachments.test.ts
+++ b/tests/attachments.test.ts
@@ -3,12 +3,12 @@ import { createReadStream, readFileSync } from 'fs';
 
 import { Attachment, LiteralClient, Maybe } from '../src';
 
-const url = process.env.LITERAL_API_URL;
+const apiUrl = process.env.LITERAL_API_URL;
 const apiKey = process.env.LITERAL_API_KEY;
-if (!url || !apiKey) {
+if (!apiUrl || !apiKey) {
   throw new Error('Missing environment variables');
 }
-const client = new LiteralClient(apiKey, url);
+const client = new LiteralClient({ apiKey, apiUrl });
 
 const filePath = './tests/chainlit-logo.png';
 const mime = 'image/png';
diff --git a/tests/integration/llamaindex.test.ts b/tests/integration/llamaindex.test.ts
index bb201c8..2c7112e 100644
--- a/tests/integration/llamaindex.test.ts
+++ b/tests/integration/llamaindex.test.ts
@@ -16,14 +16,14 @@ describe('Llama Index Instrumentation', () => {
   let client: LiteralClient;
 
   beforeAll(function () {
-    const url = process.env.LITERAL_API_URL;
+    const apiUrl = process.env.LITERAL_API_URL;
     const apiKey = process.env.LITERAL_API_KEY;
 
-    if (!url || !apiKey) {
+    if (!apiUrl || !apiKey) {
       throw new Error('Missing environment variables');
     }
 
-    client = new LiteralClient(apiKey, url);
+    client = new LiteralClient({ apiKey, apiUrl });
 
     // Reset the callback manager
     Settings.callbackManager = new CallbackManager();
diff --git a/tests/integration/openai.test.ts b/tests/integration/openai.test.ts
index e88dd77..d68999d 100644
--- a/tests/integration/openai.test.ts
+++ b/tests/integration/openai.test.ts
@@ -11,10 +11,10 @@ import {
   Step
 } from '../../src';
 
-const url = process.env.LITERAL_API_URL;
+const apiUrl = process.env.LITERAL_API_URL;
 const apiKey = process.env.LITERAL_API_KEY;
 
-if (!url || !apiKey) {
+if (!apiUrl || !apiKey) {
   throw new Error('Missing environment variables');
 }
 
@@ -100,7 +100,7 @@ describe('OpenAI Instrumentation', () => {
     beforeAll(async () => {
       const testId = uuidv4();
 
-      const client = new LiteralClient(apiKey, url);
+      const client = new LiteralClient({ apiKey, apiUrl });
       client.instrumentation.openai({ tags: [testId] });
 
       await openai.chat.completions.create({
@@ -157,7 +157,7 @@ describe('OpenAI Instrumentation', () => {
       beforeAll(async () => {
         const testId = uuidv4();
 
-        const client = new LiteralClient(apiKey, url);
+        const client = new LiteralClient({ apiKey, apiUrl });
 
         client.instrumentation.openai({ tags: [testId] });
 
@@ -209,7 +209,7 @@ describe('OpenAI Instrumentation', () => {
       it('should monitor image generation', async () => {
         const testId = uuidv4();
 
-        const client = new LiteralClient(apiKey, url);
+        const client = new LiteralClient({ apiKey, apiUrl });
         client.instrumentation.openai({ tags: [testId] });
 
         const response = await openai.images.generate({
@@ -237,8 +237,10 @@ describe('OpenAI Instrumentation', () => {
 
   describe('Inside of a thread or step wrapper', () => {
     it('logs the generation inside its thread and parent', async () => {
-      const client = new LiteralClient(apiKey, url);
-      client.instrumentation.openai();
+      const testId = uuidv4();
+
+      const client = new LiteralClient({ apiKey, apiUrl });
+      client.instrumentation.openai({ tags: [testId] });
 
       let threadId: Maybe<string>;
       let parentId: Maybe<string>;
@@ -272,8 +274,10 @@ describe('OpenAI Instrumentation', () => {
     }, 30_000);
 
     it("doesn't mix up threads and steps", async () => {
-      const client = new LiteralClient(apiKey, url);
-      client.instrumentation.openai();
+      const testId = uuidv4();
+
+      const client = new LiteralClient({ apiKey, apiUrl });
+      client.instrumentation.openai({ tags: [testId] });
 
       const firstThreadId = uuidv4();
       const secondThreadId = uuidv4();
@@ -344,7 +348,7 @@ describe('OpenAI Instrumentation', () => {
 
   describe('Handling tags and metadata', () => {
     it('handles tags and metadata on the instrumentation call', async () => {
-      const client = new LiteralClient(apiKey, url);
+      const client = new LiteralClient({ apiKey, apiUrl });
       client.instrumentation.openai({
         tags: ['tag1', 'tag2'],
         metadata: { key: 'value' }
@@ -366,6 +370,8 @@ describe('OpenAI Instrumentation', () => {
         });
       });
 
+      await new Promise((resolve) => setTimeout(resolve, 2000));
+
       const {
         data: [step]
       } = await client.api.getSteps({
@@ -378,7 +384,7 @@ describe('OpenAI Instrumentation', () => {
     }, 30_000);
 
     it('handles tags and metadata on the LLM call', async () => {
-      const client = new LiteralClient(apiKey, url);
+      const client = new LiteralClient({ apiKey, apiUrl });
 
       const instrumentedOpenAi = client.instrumentation.openai({
         tags: ['tag1', 'tag2'],
@@ -407,6 +413,8 @@ describe('OpenAI Instrumentation', () => {
         });
       });
 
+      await new Promise((resolve) => setTimeout(resolve, 3000));
+
       const {
         data: [step]
       } = await client.api.getSteps({
diff --git a/tests/integration/vercel-sdk.test.ts b/tests/integration/vercel-sdk.test.ts
index bc604b3..10274bc 100644
--- a/tests/integration/vercel-sdk.test.ts
+++ b/tests/integration/vercel-sdk.test.ts
@@ -9,14 +9,14 @@ describe('Vercel SDK Instrumentation', () => {
   let client: LiteralClient;
 
   beforeAll(function () {
-    const url = process.env.LITERAL_API_URL;
+    const apiUrl = process.env.LITERAL_API_URL;
     const apiKey = process.env.LITERAL_API_KEY;
 
-    if (!url || !apiKey) {
+    if (!apiUrl || !apiKey) {
       throw new Error('Missing environment variables');
     }
 
-    client = new LiteralClient(apiKey, url);
+    client = new LiteralClient({ apiKey, apiUrl });
   });
 
   // Skip for the CI
diff --git a/tests/wrappers.test.ts b/tests/wrappers.test.ts
index 35cbfc0..01deeb7 100644
--- a/tests/wrappers.test.ts
+++ b/tests/wrappers.test.ts
@@ -1,6 +1,6 @@
 import 'dotenv/config';
 
-import { LiteralClient, Maybe, Step } from '../src';
+import { DatasetExperimentItem, LiteralClient, Maybe, Step } from '../src';
 
 const url = process.env.LITERAL_API_URL;
 const apiKey = process.env.LITERAL_API_KEY;
@@ -9,7 +9,7 @@ if (!url || !apiKey) {
   throw new Error('Missing environment variables');
 }
 
-const client = new LiteralClient(apiKey, url);
+const client = new LiteralClient({ apiKey, apiUrl: url });
 
 function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -350,6 +350,43 @@ describe('Wrapper', () => {
     });
   });
 
+  describe('Wrapping experimentRun', () => {
+    it('wraps an experiment run', async () => {
+      const experiment = await client.api.createExperiment({
+        name: 'Test Experiment Run'
+      });
+      let persistedExperimentItem: DatasetExperimentItem | undefined =
+        undefined;
+
+      await client.experimentRun().wrap(async () => {
+        const scores = [
+          {
+            name: 'context_relevancy',
+            type: 'AI' as const,
+            value: 0.6
+          }
+        ];
+        await client.step({ name: 'agent', type: 'run' }).wrap(async () => {
+          const experimentItem = {
+            scores: scores, // scores in the format above
+            input: { question: 'question' },
+            output: { content: 'answer' }
+          };
+          persistedExperimentItem = await experiment.log(experimentItem);
+        });
+      });
+      expect(persistedExperimentItem).toBeTruthy();
+
+      await sleep(1000);
+
+      const experimentRunId = persistedExperimentItem!.experimentRunId;
+      expect(experimentRunId).toBeTruthy();
+      const experimentRun = await client.api.getStep(experimentRunId!);
+      expect(experimentRun).toBeTruthy();
+      expect(experimentRun?.environment).toEqual('experiment');
+    });
+  });
+
   describe('Concurrency', () => {
     it("doesn't mix up threads and steps", async () => {
       let firstThreadId: Maybe<string>;