diff --git a/OpenAI-DotNet/Assistants/Assistant.cs b/OpenAI-DotNet/Assistants/Assistant.cs
index 252c0c3a..0ae9f4ae 100644
--- a/OpenAI-DotNet/Assistants/Assistant.cs
+++ b/OpenAI-DotNet/Assistants/Assistant.cs
@@ -1,70 +1,71 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace OpenAI.Assistants;
-
-public sealed class Assistant
+namespace OpenAI.Assistants
 {
-    /// <summary>
-    /// The identifier, which can be referenced in API endpoints.
-    /// </summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; }
+    public sealed class Assistant
+    {
+        /// <summary>
+        /// The identifier, which can be referenced in API endpoints.
+        /// </summary>
+        [JsonPropertyName("id")]
+        public string Id { get; set; }
 
-    /// <summary>
-    /// The object type, which is always assistant.
-    /// </summary>
-    [JsonPropertyName("object")]
-    public string Object { get; set; } = "assistant";
+        /// <summary>
+        /// The object type, which is always assistant.
+        /// </summary>
+        [JsonPropertyName("object")]
+        public string Object { get; set; } = "assistant";
 
-    /// <summary>
-    /// The Unix timestamp (in seconds) for when the assistant was created.
-    /// </summary>
-    [JsonPropertyName("created_at")]
-    public int CreatedAt { get; set; }
+        /// <summary>
+        /// The Unix timestamp (in seconds) for when the assistant was created.
+        /// </summary>
+        [JsonPropertyName("created_at")]
+        public int CreatedAt { get; set; }
     
-    /// <summary>
-    /// The name of the assistant. The maximum length is 256 characters.
-    /// </summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; }
+        /// <summary>
+        /// The name of the assistant. The maximum length is 256 characters.
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
 
-    /// <summary>
-    /// The description of the assistant. The maximum length is 512 characters.
-    /// </summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; }
+        /// <summary>
+        /// The description of the assistant. The maximum length is 512 characters.
+        /// </summary>
+        [JsonPropertyName("description")]
+        public string Description { get; set; }
 
-    /// <summary>
-    /// ID of the model to use. You can use the List models API to see all of your available models, or see our Model overview for descriptions of them.
-    /// </summary>
-    [JsonPropertyName("model")]
-    public string Model { get; set; }
+        /// <summary>
+        /// ID of the model to use. You can use the List models API to see all of your available models, or see our Model overview for descriptions of them.
+        /// </summary>
+        [JsonPropertyName("model")]
+        public string Model { get; set; }
 
-    /// <summary>
-    /// The system instructions that the assistant uses. The maximum length is 32768 characters.
-    /// </summary>
-    [JsonPropertyName("instructions")]
-    public string Instructions { get; set; }
+        /// <summary>
+        /// The system instructions that the assistant uses. The maximum length is 32768 characters.
+        /// </summary>
+        [JsonPropertyName("instructions")]
+        public string Instructions { get; set; }
 
-    /// <summary>
-    /// A list of tool enabled on the assistant. There can be a maximum of 128 tools per assistant.
-    /// Tools can be of types code_interpreter, retrieval, or function.
-    /// </summary>
-    [JsonPropertyName("tools")]
-    public IReadOnlyList<AssistantTool> Tools { get; set; }
+        /// <summary>
+        /// A list of tool enabled on the assistant. There can be a maximum of 128 tools per assistant.
+        /// Tools can be of types code_interpreter, retrieval, or function.
+        /// </summary>
+        [JsonPropertyName("tools")]
+        public IReadOnlyList<AssistantTool> Tools { get; set; }
 
-    /// <summary>
-    /// A list of file IDs attached to this assistant. There can be a maximum of 20 files attached to the assistant.
-    /// Files are ordered by their creation date in ascending order.
-    /// </summary>
-    [JsonPropertyName("file_ids")]
-    public IReadOnlyList<string> FileIds { get; set; }
+        /// <summary>
+        /// A list of file IDs attached to this assistant. There can be a maximum of 20 files attached to the assistant.
+        /// Files are ordered by their creation date in ascending order.
+        /// </summary>
+        [JsonPropertyName("file_ids")]
+        public IReadOnlyList<string> FileIds { get; set; }
 
-    /// <summary>
-    /// Set of 16 key-value pairs that can be attached to an object. This can be useful for storing additional information
-    /// about the object in a structured format. Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.
-    /// </summary>
-    [JsonPropertyName("metadata")]
-    public IReadOnlyDictionary<string, object> Metadata { get; set; }
+        /// <summary>
+        /// Set of 16 key-value pairs that can be attached to an object. This can be useful for storing additional information
+        /// about the object in a structured format. Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.
+        /// </summary>
+        [JsonPropertyName("metadata")]
+        public IReadOnlyDictionary<string, object> Metadata { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/OpenAI-DotNet/Assistants/AssistantFile.cs b/OpenAI-DotNet/Assistants/AssistantFile.cs
index 0def7d75..63b2988b 100644
--- a/OpenAI-DotNet/Assistants/AssistantFile.cs
+++ b/OpenAI-DotNet/Assistants/AssistantFile.cs
@@ -1,34 +1,35 @@
 using System.Text.Json.Serialization;
 
-namespace OpenAI.Assistants;
-
-/// <summary>
-/// File attached to an assistant.
-/// </summary>
-public sealed class AssistantFile
+namespace OpenAI.Assistants
 {
     /// <summary>
-    /// The identifier, which can be referenced in API endpoints.
+    /// File attached to an assistant.
     /// </summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; }
+    public sealed class AssistantFile
+    {
+        /// <summary>
+        /// The identifier, which can be referenced in API endpoints.
+        /// </summary>
+        [JsonPropertyName("id")]
+        public string Id { get; set; }
 
-    /// <summary>
-    /// The object type, which is always assistant.file.
-    /// </summary>
-    [JsonPropertyName("object")]
-    public string Object { get; set; } = "assistant.file";
+        /// <summary>
+        /// The object type, which is always assistant.file.
+        /// </summary>
+        [JsonPropertyName("object")]
+        public string Object { get; set; } = "assistant.file";
         
-    /// <summary>
-    /// The Unix timestamp (in seconds) for when the assistant file was created.
-    /// </summary>
-    [JsonPropertyName("created_at")]
-    public int CreatedAt { get; set; }
+        /// <summary>
+        /// The Unix timestamp (in seconds) for when the assistant file was created.
+        /// </summary>
+        [JsonPropertyName("created_at")]
+        public int CreatedAt { get; set; }
         
-    /// <summary>
-    /// The assistant ID that the file is attached to.
-    /// </summary>
-    /// <returns></returns>
-    [JsonPropertyName("assistant_id")]
-    public string AssistantId { get; set; }
+        /// <summary>
+        /// The assistant ID that the file is attached to.
+        /// </summary>
+        /// <returns></returns>
+        [JsonPropertyName("assistant_id")]
+        public string AssistantId { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/OpenAI-DotNet/Assistants/AssistantFilesList.cs b/OpenAI-DotNet/Assistants/AssistantFilesList.cs
index 45f88092..ce702331 100644
--- a/OpenAI-DotNet/Assistants/AssistantFilesList.cs
+++ b/OpenAI-DotNet/Assistants/AssistantFilesList.cs
@@ -1,22 +1,23 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace OpenAI.Assistants;
-
-public class AssistantFilesList
+namespace OpenAI.Assistants
 {
-    [JsonPropertyName("object")]
-    public string Object { get; set; } = "list";
+    public class AssistantFilesList
+    {
+        [JsonPropertyName("object")]
+        public string Object { get; set; } = "list";
     
-    [JsonPropertyName("data")]
-    public IReadOnlyList<AssistantFile> Data { get; set; }
+        [JsonPropertyName("data")]
+        public IReadOnlyList<AssistantFile> Data { get; set; }
 
-    [JsonPropertyName("first_id")]
-    public string FirstId { get; set; }
+        [JsonPropertyName("first_id")]
+        public string FirstId { get; set; }
 
-    [JsonPropertyName("last_id")]
-    public string LastId { get; set; }
+        [JsonPropertyName("last_id")]
+        public string LastId { get; set; }
 
-    [JsonPropertyName("has_more")]
-    public bool HasMore { get; set; }
+        [JsonPropertyName("has_more")]
+        public bool HasMore { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/OpenAI-DotNet/Assistants/AssistantTool.cs b/OpenAI-DotNet/Assistants/AssistantTool.cs
index c267403d..cdafa94f 100644
--- a/OpenAI-DotNet/Assistants/AssistantTool.cs
+++ b/OpenAI-DotNet/Assistants/AssistantTool.cs
@@ -1,13 +1,14 @@
 using System.Text.Json.Serialization;
 using OpenAI.Chat;
 
-namespace OpenAI.Assistants;
-
-public sealed class AssistantTool
+namespace OpenAI.Assistants
 {
-    [JsonPropertyName("type")]
-    public string Type { get; set; }
+    public sealed class AssistantTool
+    {
+        [JsonPropertyName("type")]
+        public string Type { get; set; }
     
-    [JsonPropertyName("function")]
-    public Function Function { get; set; }
+        [JsonPropertyName("function")]
+        public Function Function { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/OpenAI-DotNet/Assistants/AssistantsEndpoint.cs b/OpenAI-DotNet/Assistants/AssistantsEndpoint.cs
index 5c5a9b98..d7c3c4eb 100644
--- a/OpenAI-DotNet/Assistants/AssistantsEndpoint.cs
+++ b/OpenAI-DotNet/Assistants/AssistantsEndpoint.cs
@@ -6,201 +6,202 @@
 using System.Threading.Tasks;
 using OpenAI.Extensions;
 
-namespace OpenAI.Assistants;
-
-public class AssistantsEndpoint : BaseEndPoint
+namespace OpenAI.Assistants
 {
-    internal AssistantsEndpoint(OpenAIClient api) : base(api) { }
-
-    protected override string Root => "assistants";
-    
-    /// <summary>
-    /// Create an assistant with a model and instructions.
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<Assistant> CreateAssistantAsync(CreateAssistantRequest request, CancellationToken cancellationToken = default)
+    public class AssistantsEndpoint : BaseEndPoint
     {
-        var jsonContent = JsonSerializer.Serialize(request, OpenAIClient.JsonSerializationOptions).ToJsonStringContent(EnableDebug);
-        var response = await Api.Client.PostAsync(GetUrl(), jsonContent, cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var created = JsonSerializer.Deserialize<Assistant>(responseAsString, OpenAIClient.JsonSerializationOptions);
+        internal AssistantsEndpoint(OpenAIClient api) : base(api) { }
 
-        return created;
-    }
-
-    /// <summary>
-    /// Retrieves an assistant.
-    /// </summary>
-    /// <param name="assistantId">The ID of the assistant to retrieve.</param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<Assistant> RetrieveAssistantAsync(string assistantId, CancellationToken cancellationToken = default)
-    {
-        var response = await Api.Client.GetAsync(GetUrl($"/{assistantId}"), cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var assistant = JsonSerializer.Deserialize<Assistant>(responseAsString, OpenAIClient.JsonSerializationOptions);
-
-        return assistant;
-    }
+        protected override string Root => "assistants";
     
-    /// <summary>
-    /// Modifies an assistant.
-    /// </summary>
-    /// <param name="assistantId">The ID of the assistant to modify.</param>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<Assistant> ModifyAssistantAsync(string assistantId, ModifyAssistantRequest request, CancellationToken cancellationToken = default)
-    {
-        var jsonContent = JsonSerializer.Serialize(request, OpenAIClient.JsonSerializationOptions).ToJsonStringContent(EnableDebug);
-        var response = await Api.Client.PostAsync(GetUrl($"/{assistantId}"), jsonContent, cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var modified = JsonSerializer.Deserialize<Assistant>(responseAsString, OpenAIClient.JsonSerializationOptions);
-
-        return modified;
-    }
-
-    /// <summary>
-    /// Delete an assistant.
-    /// </summary>
-    /// <param name="assistantId">The ID of the assistant to delete.</param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<bool> DeleteAssistantAsync(string assistantId, CancellationToken cancellationToken = default)
-    {
-        var response = await Api.Client.DeleteAsync(GetUrl($"/{assistantId}"), cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var status = JsonSerializer.Deserialize<DeletionStatus>(responseAsString, OpenAIClient.JsonSerializationOptions);
-
-        return status.Deleted;
-    }
+        /// <summary>
+        /// Create an assistant with a model and instructions.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<Assistant> CreateAssistantAsync(CreateAssistantRequest request, CancellationToken cancellationToken = default)
+        {
+            var jsonContent = JsonSerializer.Serialize(request, OpenAIClient.JsonSerializationOptions).ToJsonStringContent(EnableDebug);
+            var response = await Api.Client.PostAsync(GetUrl(), jsonContent, cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var created = JsonSerializer.Deserialize<Assistant>(responseAsString, OpenAIClient.JsonSerializationOptions);
+
+            return created;
+        }
+
+        /// <summary>
+        /// Retrieves an assistant.
+        /// </summary>
+        /// <param name="assistantId">The ID of the assistant to retrieve.</param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<Assistant> RetrieveAssistantAsync(string assistantId, CancellationToken cancellationToken = default)
+        {
+            var response = await Api.Client.GetAsync(GetUrl($"/{assistantId}"), cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var assistant = JsonSerializer.Deserialize<Assistant>(responseAsString, OpenAIClient.JsonSerializationOptions);
+
+            return assistant;
+        }
     
-    /// <summary>
-    /// Get list of assistants.
-    /// </summary>
-    /// <param name="limit">A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.</param>
-    /// <param name="order">Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order.</param>
-    /// <param name="after">A cursor for use in pagination. after is an object ID that defines your place in the list.
-    /// For instance, if you make a list request and receive 100 objects, ending with obj_foo,
-    /// your subsequent call can include after=obj_foo in order to fetch the next page of the list.</param>
-    /// <param name="before">A cursor for use in pagination. before is an object ID that defines your place in the list.
-    /// For instance, if you make a list request and receive 100 objects, ending with obj_foo,
-    /// your subsequent call can include before=obj_foo in order to fetch the previous page of the list.
-    /// </param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<AssistantsList> ListAssistantsAsync(
-        int? limit = null, string order = "desc", string after = null, string before = null,
-        CancellationToken cancellationToken = default)
-    {
-        var parameters = new Dictionary<string, string>();
-        if (limit.HasValue) parameters.Add("limit", limit.ToString());
-        if (!String.IsNullOrEmpty(order)) parameters.Add("order", order);
-        if (!String.IsNullOrEmpty(after)) parameters.Add("after", after);
-        if (!String.IsNullOrEmpty(before)) parameters.Add("before", before);
-
-        var response = await Api.Client.GetAsync(GetUrl(queryParameters: parameters), cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var list = JsonSerializer.Deserialize<AssistantsList>(responseAsString, OpenAIClient.JsonSerializationOptions);
-
-        return list;
-    }
-
-    /// <summary>
-    /// Create an assistant file by attaching a File to an assistant.
-    /// </summary>
-    /// <param name="assistantId">The ID of the assistant for which to create a File.</param>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<AssistantFile> CreateAssistantFileAsync(string assistantId, CreateAssistantFileRequest request, CancellationToken cancellationToken = default)
-    {
-        var jsonContent = JsonSerializer.Serialize(request, OpenAIClient.JsonSerializationOptions).ToJsonStringContent(EnableDebug);
-        var response = await Api.Client.PostAsync(GetUrl($"/{assistantId}/files"), jsonContent, cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var created = JsonSerializer.Deserialize<AssistantFile>(responseAsString, OpenAIClient.JsonSerializationOptions);
-
-        return created;
-    }
-
-    /// <summary>
-    /// Retrieves an AssistantFile.
-    /// </summary>
-    /// <param name="assistantId">The ID of the assistant who the file belongs to.</param>
-    /// <param name="fileId">The ID of the file we're getting.</param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<AssistantFile> RetrieveAssistantFileAsync(string assistantId, string fileId, CancellationToken cancellationToken = default)
-    {
-        var response = await Api.Client.GetAsync(GetUrl($"/{assistantId}/files/{fileId}"), cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var created = JsonSerializer.Deserialize<AssistantFile>(responseAsString, OpenAIClient.JsonSerializationOptions);
-
-        return created;
-    }
-
-    /// <summary>
-    /// Delete an assistant file.
-    /// </summary>
-    /// <param name="assistantId">The ID of the assistant that the file belongs to.</param>
-    /// <param name="fileId">The ID of the file to delete.</param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<bool> DeleteAssistantFileAsync(string assistantId, string fileId, CancellationToken cancellationToken = default)
-    {
-        var response = await Api.Client.DeleteAsync(GetUrl($"/{assistantId}/files/{fileId}"), cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var status = JsonSerializer.Deserialize<DeletionStatus>(responseAsString, OpenAIClient.JsonSerializationOptions);
-
-        return status.Deleted;
-    }
-
-    /// <summary>
-    /// Returns a list of assistant files.
-    /// </summary>
-    /// <param name="assistantId">The ID of the assistant the file belongs to.</param>
-    /// <param name="limit">A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.</param>
-    /// <param name="order">Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order.</param>
-    /// <param name="after">A cursor for use in pagination. after is an object ID that defines your place in the list.
-    /// For instance, if you make a list request and receive 100 objects, ending with obj_foo,
-    /// your subsequent call can include after=obj_foo in order to fetch the next page of the list.</param>
-    /// <param name="before">A cursor for use in pagination. before is an object ID that defines your place in the list.
-    /// For instance, if you make a list request and receive 100 objects, ending with obj_foo,
-    /// your subsequent call can include before=obj_foo in order to fetch the previous page of the list.</param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<AssistantFilesList> ListAssistantFilesAsync(
-        string assistantId,
-        int? limit = null, string order = "desc", string after = null, string before = null,
-        CancellationToken cancellationToken = default)
-    {
-        var parameters = new Dictionary<string, string>();
-        if (limit.HasValue) parameters.Add("limit", limit.ToString());
-        if (!String.IsNullOrEmpty(order)) parameters.Add("order", order);
-        if (!String.IsNullOrEmpty(after)) parameters.Add("after", after);
-        if (!String.IsNullOrEmpty(before)) parameters.Add("before", before);
-
-        var response = await Api.Client.GetAsync(GetUrl($"/{assistantId}/files", parameters), cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var list = JsonSerializer.Deserialize<AssistantFilesList>(responseAsString, OpenAIClient.JsonSerializationOptions);
-
-        return list;
-    }
-
-    private sealed class DeletionStatus
-    {
-        [JsonInclude]
-        [JsonPropertyName("id")]
-        public string Id { get; private set; }
-
-        [JsonInclude]
-        [JsonPropertyName("object")]
-        public string Object { get; private set; }
-
-        [JsonInclude]
-        [JsonPropertyName("deleted")]
-        public bool Deleted { get; private set; }
+        /// <summary>
+        /// Modifies an assistant.
+        /// </summary>
+        /// <param name="assistantId">The ID of the assistant to modify.</param>
+        /// <param name="request"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<Assistant> ModifyAssistantAsync(string assistantId, ModifyAssistantRequest request, CancellationToken cancellationToken = default)
+        {
+            var jsonContent = JsonSerializer.Serialize(request, OpenAIClient.JsonSerializationOptions).ToJsonStringContent(EnableDebug);
+            var response = await Api.Client.PostAsync(GetUrl($"/{assistantId}"), jsonContent, cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var modified = JsonSerializer.Deserialize<Assistant>(responseAsString, OpenAIClient.JsonSerializationOptions);
+
+            return modified;
+        }
+
+        /// <summary>
+        /// Delete an assistant.
+        /// </summary>
+        /// <param name="assistantId">The ID of the assistant to delete.</param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<bool> DeleteAssistantAsync(string assistantId, CancellationToken cancellationToken = default)
+        {
+            var response = await Api.Client.DeleteAsync(GetUrl($"/{assistantId}"), cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var status = JsonSerializer.Deserialize<DeletionStatus>(responseAsString, OpenAIClient.JsonSerializationOptions);
+
+            return status.Deleted;
+        }
+    
+        /// <summary>
+        /// Get list of assistants.
+        /// </summary>
+        /// <param name="limit">A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.</param>
+        /// <param name="order">Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order.</param>
+        /// <param name="after">A cursor for use in pagination. after is an object ID that defines your place in the list.
+        /// For instance, if you make a list request and receive 100 objects, ending with obj_foo,
+        /// your subsequent call can include after=obj_foo in order to fetch the next page of the list.</param>
+        /// <param name="before">A cursor for use in pagination. before is an object ID that defines your place in the list.
+        /// For instance, if you make a list request and receive 100 objects, ending with obj_foo,
+        /// your subsequent call can include before=obj_foo in order to fetch the previous page of the list.
+        /// </param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<AssistantsList> ListAssistantsAsync(
+            int? limit = null, string order = "desc", string after = null, string before = null,
+            CancellationToken cancellationToken = default)
+        {
+            var parameters = new Dictionary<string, string>();
+            if (limit.HasValue) parameters.Add("limit", limit.ToString());
+            if (!String.IsNullOrEmpty(order)) parameters.Add("order", order);
+            if (!String.IsNullOrEmpty(after)) parameters.Add("after", after);
+            if (!String.IsNullOrEmpty(before)) parameters.Add("before", before);
+
+            var response = await Api.Client.GetAsync(GetUrl(queryParameters: parameters), cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var list = JsonSerializer.Deserialize<AssistantsList>(responseAsString, OpenAIClient.JsonSerializationOptions);
+
+            return list;
+        }
+
+        /// <summary>
+        /// Create an assistant file by attaching a File to an assistant.
+        /// </summary>
+        /// <param name="assistantId">The ID of the assistant for which to create a File.</param>
+        /// <param name="request"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<AssistantFile> CreateAssistantFileAsync(string assistantId, CreateAssistantFileRequest request, CancellationToken cancellationToken = default)
+        {
+            var jsonContent = JsonSerializer.Serialize(request, OpenAIClient.JsonSerializationOptions).ToJsonStringContent(EnableDebug);
+            var response = await Api.Client.PostAsync(GetUrl($"/{assistantId}/files"), jsonContent, cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var created = JsonSerializer.Deserialize<AssistantFile>(responseAsString, OpenAIClient.JsonSerializationOptions);
+
+            return created;
+        }
+
+        /// <summary>
+        /// Retrieves an AssistantFile.
+        /// </summary>
+        /// <param name="assistantId">The ID of the assistant who the file belongs to.</param>
+        /// <param name="fileId">The ID of the file we're getting.</param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<AssistantFile> RetrieveAssistantFileAsync(string assistantId, string fileId, CancellationToken cancellationToken = default)
+        {
+            var response = await Api.Client.GetAsync(GetUrl($"/{assistantId}/files/{fileId}"), cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var created = JsonSerializer.Deserialize<AssistantFile>(responseAsString, OpenAIClient.JsonSerializationOptions);
+
+            return created;
+        }
+
+        /// <summary>
+        /// Delete an assistant file.
+        /// </summary>
+        /// <param name="assistantId">The ID of the assistant that the file belongs to.</param>
+        /// <param name="fileId">The ID of the file to delete.</param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<bool> DeleteAssistantFileAsync(string assistantId, string fileId, CancellationToken cancellationToken = default)
+        {
+            var response = await Api.Client.DeleteAsync(GetUrl($"/{assistantId}/files/{fileId}"), cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var status = JsonSerializer.Deserialize<DeletionStatus>(responseAsString, OpenAIClient.JsonSerializationOptions);
+
+            return status.Deleted;
+        }
+
+        /// <summary>
+        /// Returns a list of assistant files.
+        /// </summary>
+        /// <param name="assistantId">The ID of the assistant the file belongs to.</param>
+        /// <param name="limit">A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.</param>
+        /// <param name="order">Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order.</param>
+        /// <param name="after">A cursor for use in pagination. after is an object ID that defines your place in the list.
+        /// For instance, if you make a list request and receive 100 objects, ending with obj_foo,
+        /// your subsequent call can include after=obj_foo in order to fetch the next page of the list.</param>
+        /// <param name="before">A cursor for use in pagination. before is an object ID that defines your place in the list.
+        /// For instance, if you make a list request and receive 100 objects, ending with obj_foo,
+        /// your subsequent call can include before=obj_foo in order to fetch the previous page of the list.</param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<AssistantFilesList> ListAssistantFilesAsync(
+            string assistantId,
+            int? limit = null, string order = "desc", string after = null, string before = null,
+            CancellationToken cancellationToken = default)
+        {
+            var parameters = new Dictionary<string, string>();
+            if (limit.HasValue) parameters.Add("limit", limit.ToString());
+            if (!String.IsNullOrEmpty(order)) parameters.Add("order", order);
+            if (!String.IsNullOrEmpty(after)) parameters.Add("after", after);
+            if (!String.IsNullOrEmpty(before)) parameters.Add("before", before);
+
+            var response = await Api.Client.GetAsync(GetUrl($"/{assistantId}/files", parameters), cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var list = JsonSerializer.Deserialize<AssistantFilesList>(responseAsString, OpenAIClient.JsonSerializationOptions);
+
+            return list;
+        }
+
+        private sealed class DeletionStatus
+        {
+            [JsonInclude]
+            [JsonPropertyName("id")]
+            public string Id { get; private set; }
+
+            [JsonInclude]
+            [JsonPropertyName("object")]
+            public string Object { get; private set; }
+
+            [JsonInclude]
+            [JsonPropertyName("deleted")]
+            public bool Deleted { get; private set; }
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenAI-DotNet/Assistants/AssistantsList.cs b/OpenAI-DotNet/Assistants/AssistantsList.cs
index 70a74f1e..b4959d5b 100644
--- a/OpenAI-DotNet/Assistants/AssistantsList.cs
+++ b/OpenAI-DotNet/Assistants/AssistantsList.cs
@@ -1,22 +1,23 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace OpenAI.Assistants;
-
-public sealed class AssistantsList
+namespace OpenAI.Assistants
 {
-    [JsonPropertyName("object")]
-    public string Object { get; set; } = "list";
+    public sealed class AssistantsList
+    {
+        [JsonPropertyName("object")]
+        public string Object { get; set; } = "list";
 
-    [JsonPropertyName("data")]
-    public IReadOnlyList<Assistant> Data { get; set; }
+        [JsonPropertyName("data")]
+        public IReadOnlyList<Assistant> Data { get; set; }
 
-    [JsonPropertyName("first_id")]
-    public string FirstId { get; set; }
+        [JsonPropertyName("first_id")]
+        public string FirstId { get; set; }
 
-    [JsonPropertyName("last_id")]
-    public string LastId { get; set; }
+        [JsonPropertyName("last_id")]
+        public string LastId { get; set; }
 
-    [JsonPropertyName("has_more")]
-    public bool HasMore { get; set; }
+        [JsonPropertyName("has_more")]
+        public bool HasMore { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/OpenAI-DotNet/Assistants/CreateAssistantFileRequest.cs b/OpenAI-DotNet/Assistants/CreateAssistantFileRequest.cs
index 7a55ee9f..5064e6f4 100644
--- a/OpenAI-DotNet/Assistants/CreateAssistantFileRequest.cs
+++ b/OpenAI-DotNet/Assistants/CreateAssistantFileRequest.cs
@@ -1,14 +1,15 @@
 using System.Text.Json.Serialization;
 
-namespace OpenAI.Assistants;
-
-public sealed class CreateAssistantFileRequest
+namespace OpenAI.Assistants
 {
-    /// <summary>
-    /// A File ID (with purpose="assistants") that the assistant should use.
-    /// Useful for tools like retrieval and code_interpreter that can access files.
-    /// </summary>
-    /// <returns></returns>
-    [JsonPropertyName("file_id")]
-    public string FileId { get; set; }
+    public sealed class CreateAssistantFileRequest
+    {
+        /// <summary>
+        /// A File ID (with purpose="assistants") that the assistant should use.
+        /// Useful for tools like retrieval and code_interpreter that can access files.
+        /// </summary>
+        /// <returns></returns>
+        [JsonPropertyName("file_id")]
+        public string FileId { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/OpenAI-DotNet/Assistants/CreateAssistantRequest.cs b/OpenAI-DotNet/Assistants/CreateAssistantRequest.cs
index a26d6ea6..9033ea88 100644
--- a/OpenAI-DotNet/Assistants/CreateAssistantRequest.cs
+++ b/OpenAI-DotNet/Assistants/CreateAssistantRequest.cs
@@ -1,52 +1,53 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace OpenAI.Assistants;
-
-public sealed class CreateAssistantRequest
+namespace OpenAI.Assistants
 {
-    /// <summary>
-    /// ID of the model to use. You can use the List models API to see all of your available models, or see our Model overview for descriptions of them.
-    /// </summary>
-    [JsonPropertyName("model")]
-    public string Model { get; set; }
-
-    /// <summary>
-    /// The name of the assistant. The maximum length is 256 characters.
-    /// </summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; }
-
-    /// <summary>
-    /// The description of the assistant. The maximum length is 512 characters.
-    /// </summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; }
-
-    /// <summary>
-    /// The system instructions that the assistant uses. The maximum length is 32768 characters.
-    /// </summary>
-    [JsonPropertyName("instructions")]
-    public string Instructions { get; set; }
-
-    /// <summary>
-    /// A list of tool enabled on the assistant. There can be a maximum of 128 tools per assistant.
-    /// Tools can be of types code_interpreter, retrieval, or function.
-    /// </summary>
-    [JsonPropertyName("tools")]
-    public List<AssistantTool> Tools { get; set; }
-
-    /// <summary>
-    /// A list of file IDs attached to this assistant. There can be a maximum of 20 files attached to the assistant.
-    /// Files are ordered by their creation date in ascending order.
-    /// </summary>
-    [JsonPropertyName("file_ids")]
-    public List<string> FileIds { get; set; }
-
-    /// <summary>
-    /// Set of 16 key-value pairs that can be attached to an object. This can be useful for storing additional information
-    /// about the object in a structured format. Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.
-    /// </summary>
-    [JsonPropertyName("metadata")]
-    public Dictionary<string, object> Metadata { get; set; }
+    public sealed class CreateAssistantRequest
+    {
+        /// <summary>
+        /// ID of the model to use. You can use the List models API to see all of your available models, or see our Model overview for descriptions of them.
+        /// </summary>
+        [JsonPropertyName("model")]
+        public string Model { get; set; }
+
+        /// <summary>
+        /// The name of the assistant. The maximum length is 256 characters.
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The description of the assistant. The maximum length is 512 characters.
+        /// </summary>
+        [JsonPropertyName("description")]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// The system instructions that the assistant uses. The maximum length is 32768 characters.
+        /// </summary>
+        [JsonPropertyName("instructions")]
+        public string Instructions { get; set; }
+
+        /// <summary>
+        /// A list of tool enabled on the assistant. There can be a maximum of 128 tools per assistant.
+        /// Tools can be of types code_interpreter, retrieval, or function.
+        /// </summary>
+        [JsonPropertyName("tools")]
+        public List<AssistantTool> Tools { get; set; }
+
+        /// <summary>
+        /// A list of file IDs attached to this assistant. There can be a maximum of 20 files attached to the assistant.
+        /// Files are ordered by their creation date in ascending order.
+        /// </summary>
+        [JsonPropertyName("file_ids")]
+        public List<string> FileIds { get; set; }
+
+        /// <summary>
+        /// Set of 16 key-value pairs that can be attached to an object. This can be useful for storing additional information
+        /// about the object in a structured format. Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.
+        /// </summary>
+        [JsonPropertyName("metadata")]
+        public Dictionary<string, object> Metadata { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/OpenAI-DotNet/Assistants/ModifyAssistantRequest.cs b/OpenAI-DotNet/Assistants/ModifyAssistantRequest.cs
index 177ea3f7..5465e540 100644
--- a/OpenAI-DotNet/Assistants/ModifyAssistantRequest.cs
+++ b/OpenAI-DotNet/Assistants/ModifyAssistantRequest.cs
@@ -1,52 +1,53 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace OpenAI.Assistants;
-
-public sealed class ModifyAssistantRequest
+namespace OpenAI.Assistants
 {
-    /// <summary>
-    /// ID of the model to use. You can use the List models API to see all of your available models, or see our Model overview for descriptions of them.
-    /// </summary>
-    [JsonPropertyName("model")]
-    public string Model { get; set; }
-
-    /// <summary>
-    /// The name of the assistant. The maximum length is 256 characters.
-    /// </summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; }
-
-    /// <summary>
-    /// The description of the assistant. The maximum length is 512 characters.
-    /// </summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; }
-
-    /// <summary>
-    /// The system instructions that the assistant uses. The maximum length is 32768 characters.
-    /// </summary>
-    [JsonPropertyName("instructions")]
-    public string Instructions { get; set; }
-
-    /// <summary>
-    /// A list of tool enabled on the assistant. There can be a maximum of 128 tools per assistant.
-    /// Tools can be of types code_interpreter, retrieval, or function.
-    /// </summary>
-    [JsonPropertyName("tools")]
-    public List<AssistantTool> Tools { get; set; }
-
-    /// <summary>
-    /// A list of file IDs attached to this assistant. There can be a maximum of 20 files attached to the assistant.
-    /// Files are ordered by their creation date in ascending order.
-    /// </summary>
-    [JsonPropertyName("file_ids")]
-    public List<string> FileIds { get; set; }
-
-    /// <summary>
-    /// Set of 16 key-value pairs that can be attached to an object. This can be useful for storing additional information
-    /// about the object in a structured format. Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.
-    /// </summary>
-    [JsonPropertyName("metadata")]
-    public Dictionary<string, object> Metadata { get; set; }
+    public sealed class ModifyAssistantRequest
+    {
+        /// <summary>
+        /// ID of the model to use. You can use the List models API to see all of your available models, or see our Model overview for descriptions of them.
+        /// </summary>
+        [JsonPropertyName("model")]
+        public string Model { get; set; }
+
+        /// <summary>
+        /// The name of the assistant. The maximum length is 256 characters.
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The description of the assistant. The maximum length is 512 characters.
+        /// </summary>
+        [JsonPropertyName("description")]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// The system instructions that the assistant uses. The maximum length is 32768 characters.
+        /// </summary>
+        [JsonPropertyName("instructions")]
+        public string Instructions { get; set; }
+
+        /// <summary>
+        /// A list of tool enabled on the assistant. There can be a maximum of 128 tools per assistant.
+        /// Tools can be of types code_interpreter, retrieval, or function.
+        /// </summary>
+        [JsonPropertyName("tools")]
+        public List<AssistantTool> Tools { get; set; }
+
+        /// <summary>
+        /// A list of file IDs attached to this assistant. There can be a maximum of 20 files attached to the assistant.
+        /// Files are ordered by their creation date in ascending order.
+        /// </summary>
+        [JsonPropertyName("file_ids")]
+        public List<string> FileIds { get; set; }
+
+        /// <summary>
+        /// Set of 16 key-value pairs that can be attached to an object. This can be useful for storing additional information
+        /// about the object in a structured format. Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.
+        /// </summary>
+        [JsonPropertyName("metadata")]
+        public Dictionary<string, object> Metadata { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/OpenAI-DotNet/Images/ImageResult.cs b/OpenAI-DotNet/Images/ImageResult.cs
index 5add29d8..079aef15 100644
--- a/OpenAI-DotNet/Images/ImageResult.cs
+++ b/OpenAI-DotNet/Images/ImageResult.cs
@@ -16,7 +16,7 @@ public sealed class ImageResult
         [JsonPropertyName("revised_prompt")]
         public string RevisedPrompt { get; private set; }
 
-        public static implicit operator string(ImageResult result) => result.ToString();
+        public static implicit operator string(ImageResult result) => result?.ToString();
 
         public override string ToString()
             => !string.IsNullOrWhiteSpace(Url)
diff --git a/OpenAI-DotNet/Threads/CreateThreadRequest.cs b/OpenAI-DotNet/Threads/CreateThreadRequest.cs
index c90a1a26..44f5ca45 100644
--- a/OpenAI-DotNet/Threads/CreateThreadRequest.cs
+++ b/OpenAI-DotNet/Threads/CreateThreadRequest.cs
@@ -2,59 +2,60 @@
 using System.Text.Json.Serialization;
 using OpenAI.Chat;
 
-namespace OpenAI.Threads;
-
-public sealed class CreateThreadRequest
+namespace OpenAI.Threads
 {
-    /// <summary>
-    /// A list of messages to start the thread with.
-    /// </summary>
-    [JsonPropertyName("messages")]
-    public List<Message> Messages { get; set; } = new();
-
-    /// <summary>
-    /// Set of 16 key-value pairs that can be attached to an object.
-    /// This can be useful for storing additional information about the object in a structured format.
-    /// Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.
-    /// </summary>
-    [JsonPropertyName("metadata")]
-    public Dictionary<string, object> Metadata { get; set; }
-
-    public class Message
+    public sealed class CreateThreadRequest
     {
-        public Message() { }
-
-        public Message(string content)
-        {
-            Role = Role.User;
-            Content = content;
-        }
-
-        /// <summary>
-        /// The role of the entity that is creating the message. Currently only user is supported.
-        /// </summary>
-        [JsonPropertyName("role")]
-        public Role Role { get; set; }
-
-        /// <summary>
-        /// The content of the message.
-        /// </summary>
-        [JsonPropertyName("content")]
-        public string Content { get; set; }
-
         /// <summary>
-        /// A list of File IDs that the message should use. There can be a maximum of 10 files attached to a message.
-        /// Useful for tools like retrieval and code_interpreter that can access and use files.
+        /// A list of messages to start the thread with.
         /// </summary>
-        [JsonPropertyName("file_ids")]
-        public string[] FileIds { get; set; }
+        [JsonPropertyName("messages")]
+        public List<Message> Messages { get; set; } = new();
 
         /// <summary>
         /// Set of 16 key-value pairs that can be attached to an object.
         /// This can be useful for storing additional information about the object in a structured format.
-        /// Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.
+        /// Keys can be a maximum of 64 characters long and values can be a maximum of 512 characters long.
         /// </summary>
         [JsonPropertyName("metadata")]
-        public Dictionary<string, string> Metadata { get; set; }
+        public Dictionary<string, object> Metadata { get; set; }
+
+        public class Message
+        {
+            public Message() { }
+
+            public Message(string content)
+            {
+                Role = Role.User;
+                Content = content;
+            }
+
+            /// <summary>
+            /// The role of the entity that is creating the message. Currently only user is supported.
+            /// </summary>
+            [JsonPropertyName("role")]
+            public Role Role { get; set; }
+
+            /// <summary>
+            /// The content of the message.
+            /// </summary>
+            [JsonPropertyName("content")]
+            public string Content { get; set; }
+
+            /// <summary>
+            /// A list of File IDs that the message should use. There can be a maximum of 10 files attached to a message.
+            /// Useful for tools like retrieval and code_interpreter that can access and use files.
+            /// </summary>
+            [JsonPropertyName("file_ids")]
+            public string[] FileIds { get; set; }
+
+            /// <summary>
+            /// Set of 16 key-value pairs that can be attached to an object.
+            /// This can be useful for storing additional information about the object in a structured format.
+            /// Keys can be a maximum of 64 characters long and values can be a maximum of 512 characters long.
+            /// </summary>
+            [JsonPropertyName("metadata")]
+            public Dictionary<string, string> Metadata { get; set; }
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenAI-DotNet/Threads/Thread.cs b/OpenAI-DotNet/Threads/Thread.cs
index 50ba1201..37ca6e60 100644
--- a/OpenAI-DotNet/Threads/Thread.cs
+++ b/OpenAI-DotNet/Threads/Thread.cs
@@ -1,34 +1,35 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace OpenAI.Threads;
-
-public sealed class Thread
+namespace OpenAI.Threads
 {
-    /// <summary>
-    /// The identifier, which can be referenced in API endpoints.
-    /// </summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; }
+    public sealed class Thread
+    {
+        /// <summary>
+        /// The identifier, which can be referenced in API endpoints.
+        /// </summary>
+        [JsonPropertyName("id")]
+        public string Id { get; set; }
 
-    /// <summary>
-    /// The object type, which is always thread.
-    /// </summary>
-    [JsonPropertyName("object")]
-    public string Object { get; set; } = "thread";
+        /// <summary>
+        /// The object type, which is always thread.
+        /// </summary>
+        [JsonPropertyName("object")]
+        public string Object { get; set; } = "thread";
 
-    /// <summary>
-    /// The Unix timestamp (in seconds) for when the thread was created.
-    /// </summary>
-    /// <returns></returns>
-    [JsonPropertyName("created_at")]
-    public int CreatedAt { get; set; }
+        /// <summary>
+        /// The Unix timestamp (in seconds) for when the thread was created.
+        /// </summary>
+        /// <returns></returns>
+        [JsonPropertyName("created_at")]
+        public int CreatedAt { get; set; }
 
-    /// <summary>
-    /// Set of 16 key-value pairs that can be attached to an object.
-    /// This can be useful for storing additional information about the object in a structured format.
-    /// Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.
-    /// </summary>
-    [JsonPropertyName("metadata")]
-    public IReadOnlyDictionary<string, string> Metadata { get; set; }
+        /// <summary>
+        /// Set of 16 key-value pairs that can be attached to an object.
+        /// This can be useful for storing additional information about the object in a structured format.
+        /// Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.
+        /// </summary>
+        [JsonPropertyName("metadata")]
+        public IReadOnlyDictionary<string, string> Metadata { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/OpenAI-DotNet/Threads/ThreadsEndpoint.cs b/OpenAI-DotNet/Threads/ThreadsEndpoint.cs
index 1bc0ceab..a4d8c830 100644
--- a/OpenAI-DotNet/Threads/ThreadsEndpoint.cs
+++ b/OpenAI-DotNet/Threads/ThreadsEndpoint.cs
@@ -5,99 +5,100 @@
 using System.Threading.Tasks;
 using OpenAI.Extensions;
 
-namespace OpenAI.Threads;
-
-public class ThreadsEndpoint : BaseEndPoint
+namespace OpenAI.Threads
 {
-    public ThreadsEndpoint(OpenAIClient api) : base(api)
+    public class ThreadsEndpoint : BaseEndPoint
     {
-    }
+        public ThreadsEndpoint(OpenAIClient api) : base(api)
+        {
+        }
 
-    protected override string Root => "/threads";
+        protected override string Root => "/threads";
 
-    /// <summary>
-    /// Create a thread.
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns>A thread object.</returns>
-    public async Task<Thread> CreateThreadAsync(CreateThreadRequest request,
-        CancellationToken cancellationToken = default)
-    {
-        var jsonContent = JsonSerializer.Serialize(request, OpenAIClient.JsonSerializationOptions)
-            .ToJsonStringContent(EnableDebug);
-        var response = await Api.Client.PostAsync(GetUrl(), jsonContent, cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var created = JsonSerializer.Deserialize<Thread>(responseAsString, OpenAIClient.JsonSerializationOptions);
+        /// <summary>
+        /// Create a thread.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns>A thread object.</returns>
+        public async Task<Thread> CreateThreadAsync(CreateThreadRequest request,
+            CancellationToken cancellationToken = default)
+        {
+            var jsonContent = JsonSerializer.Serialize(request, OpenAIClient.JsonSerializationOptions)
+                .ToJsonStringContent(EnableDebug);
+            var response = await Api.Client.PostAsync(GetUrl(), jsonContent, cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var created = JsonSerializer.Deserialize<Thread>(responseAsString, OpenAIClient.JsonSerializationOptions);
 
-        return created;
-    }
+            return created;
+        }
 
-    /// <summary>
-    /// Retrieves a thread.
-    /// </summary>
-    /// <param name="threadId">The ID of the thread to retrieve.</param>
-    /// <param name="cancellationToken"></param>
-    /// <returns>The thread object matching the specified ID.</returns>
-    public async Task<Thread> RetrieveThreadAsync(string threadId, CancellationToken cancellationToken = default)
-    {
-        var response = await Api.Client.GetAsync(GetUrl($"/{threadId}"), cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var thread = JsonSerializer.Deserialize<Thread>(responseAsString, OpenAIClient.JsonSerializationOptions);
+        /// <summary>
+        /// Retrieves a thread.
+        /// </summary>
+        /// <param name="threadId">The ID of the thread to retrieve.</param>
+        /// <param name="cancellationToken"></param>
+        /// <returns>The thread object matching the specified ID.</returns>
+        public async Task<Thread> RetrieveThreadAsync(string threadId, CancellationToken cancellationToken = default)
+        {
+            var response = await Api.Client.GetAsync(GetUrl($"/{threadId}"), cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var thread = JsonSerializer.Deserialize<Thread>(responseAsString, OpenAIClient.JsonSerializationOptions);
 
-        return thread;
-    }
+            return thread;
+        }
 
-    /// <summary>
-    /// Modifies a thread.
-    /// </summary>
-    /// <param name="threadId">The ID of the thread to modify. Only the metadata can be modified.</param>
-    /// <param name="metadata">Set of 16 key-value pairs that can be attached to an object.
-    /// This can be useful for storing additional information about the object in a structured format.
-    /// Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.</param>
-    /// <param name="cancellationToken"></param>
-    /// <returns>The modified thread object matching the specified ID.</returns>
-    public async Task<Thread> ModifyThreadAsync(string threadId, Dictionary<string, object> metadata,
-        CancellationToken cancellationToken = default)
-    {
-        var jsonContent = JsonSerializer.Serialize(new { metadata = metadata }, OpenAIClient.JsonSerializationOptions)
-            .ToJsonStringContent(EnableDebug);
-        var response = await Api.Client.PostAsync(GetUrl($"/{threadId}"), jsonContent, cancellationToken)
-            .ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var thread = JsonSerializer.Deserialize<Thread>(responseAsString, OpenAIClient.JsonSerializationOptions);
+        /// <summary>
+        /// Modifies a thread.
+        /// </summary>
+        /// <param name="threadId">The ID of the thread to modify. Only the metadata can be modified.</param>
+        /// <param name="metadata">Set of 16 key-value pairs that can be attached to an object.
+        /// This can be useful for storing additional information about the object in a structured format.
+        /// Keys can be a maximum of 64 characters long and values can be a maxium of 512 characters long.</param>
+        /// <param name="cancellationToken"></param>
+        /// <returns>The modified thread object matching the specified ID.</returns>
+        public async Task<Thread> ModifyThreadAsync(string threadId, Dictionary<string, object> metadata,
+            CancellationToken cancellationToken = default)
+        {
+            var jsonContent = JsonSerializer.Serialize(new { metadata = metadata }, OpenAIClient.JsonSerializationOptions)
+                .ToJsonStringContent(EnableDebug);
+            var response = await Api.Client.PostAsync(GetUrl($"/{threadId}"), jsonContent, cancellationToken)
+                .ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var thread = JsonSerializer.Deserialize<Thread>(responseAsString, OpenAIClient.JsonSerializationOptions);
 
-        return thread;
-    }
+            return thread;
+        }
 
-    /// <summary>
-    /// Delete a thread.
-    /// </summary>
-    /// <param name="threadId">The ID of the thread to delete.</param>
-    /// <param name="cancellationToken"></param>
-    /// <returns>True, if was successfully deleted.</returns>
-    public async Task<bool> DeleteThreadAsync(string threadId, CancellationToken cancellationToken = default)
-    {
-        var response = await Api.Client.DeleteAsync(GetUrl($"/{threadId}"), cancellationToken).ConfigureAwait(false);
-        var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
-        var status =
-            JsonSerializer.Deserialize<DeletionStatus>(responseAsString, OpenAIClient.JsonSerializationOptions);
+        /// <summary>
+        /// Delete a thread.
+        /// </summary>
+        /// <param name="threadId">The ID of the thread to delete.</param>
+        /// <param name="cancellationToken"></param>
+        /// <returns>True, if was successfully deleted.</returns>
+        public async Task<bool> DeleteThreadAsync(string threadId, CancellationToken cancellationToken = default)
+        {
+            var response = await Api.Client.DeleteAsync(GetUrl($"/{threadId}"), cancellationToken).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
+            var status =
+                JsonSerializer.Deserialize<DeletionStatus>(responseAsString, OpenAIClient.JsonSerializationOptions);
 
-        return status.Deleted;
-    }
+            return status.Deleted;
+        }
 
-    private sealed class DeletionStatus
-    {
-        [JsonInclude]
-        [JsonPropertyName("id")]
-        public string Id { get; private set; }
+        private sealed class DeletionStatus
+        {
+            [JsonInclude]
+            [JsonPropertyName("id")]
+            public string Id { get; private set; }
 
-        [JsonInclude]
-        [JsonPropertyName("object")]
-        public string Object { get; private set; }
+            [JsonInclude]
+            [JsonPropertyName("object")]
+            public string Object { get; private set; }
 
-        [JsonInclude]
-        [JsonPropertyName("deleted")]
-        public bool Deleted { get; private set; }
+            [JsonInclude]
+            [JsonPropertyName("deleted")]
+            public bool Deleted { get; private set; }
+        }
     }
 }
\ No newline at end of file