diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2f578cae..4055ad5a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Release History
 
+## 2.3.0-beta.1 (Unreleased)
+
+### Other changes
+
+- Updated to `System.ClientModel` 1.5.1, which contains a fix for a concurrency bug which could cause some applications running on the legacy .NET Framework to experience an infinite loop while deserializing service responses. 
+
+- Removed explicit `net6.0` target framework, as this version reached end-of-life in November, 2024 and is no longer maintained nor supported by Microsoft.  This does not prevent using the OpenAI library on .NET 6, as the runtime will fallback to the `netstandard2.0` target.
+
 ## 2.2.0 (2025-07-02)
 
 ### Features Added
diff --git a/src/Custom/OpenAIContext.cs b/src/Custom/OpenAIContext.cs
index 23493fda3..5937afb63 100644
--- a/src/Custom/OpenAIContext.cs
+++ b/src/Custom/OpenAIContext.cs
@@ -1,11 +1,266 @@
 #nullable disable
 
+using System.ClientModel.Internal;
 using System.ClientModel.Primitives;
 using System.Diagnostics.CodeAnalysis;
 
 namespace OpenAI
 {
     [Experimental("OPENAI001")]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.Assistant))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.AssistantChatMessage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.AssistantCreationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.AssistantDeletionResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.AssistantModificationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.AssistantResponseFormat))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.AssistantThread))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Audio.AudioTokenLogProbabilityDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Audio.AudioTranscription))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Audio.AudioTranscriptionOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Audio.AudioTranslation))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Audio.AudioTranslationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatAudioOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatCompletion))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatCompletionDeletionResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatCompletionOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatFunction))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatFunctionCall))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatFunctionChoice))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatInputTokenUsageDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatMessage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatMessageAnnotation))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatMessageContentPart))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatOutputAudio))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatOutputAudioReference))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatOutputPrediction))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatOutputTokenUsageDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatResponseFormat))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatTokenLogProbabilityDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatTokenTopLogProbabilityDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatTokenUsage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatTool))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatToolCall))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatToolChoice))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ChatWebSearchOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.CodeInterpreterToolDefinition))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.CodeInterpreterToolResources))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ComputerCallAction))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ComputerCallOutputResponseItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ComputerCallResponseItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ComputerCallSafetyCheck))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ComputerOutput))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationContentPart))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationFunctionTool))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationInputTokenUsageDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationMaxTokensChoice))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationOutputTokenUsageDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationRateLimitDetailsItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationResponseOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationSessionConfiguredUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationSessionOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationSessionStartedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationStatusDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationTokenUsage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationTool))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ConversationToolChoice))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.DeveloperChatMessage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Embeddings.EmbeddingGenerationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Embeddings.EmbeddingTokenUsage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.FileChunkingStrategy))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Files.FileDeletionResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.FileFromStoreRemovalResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.FileSearchCallResponseItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.FileSearchCallResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.FileSearchRankingOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.FileSearchToolDefinition))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.FileSearchToolRankingOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.FileSearchToolResources))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.FineTuningCheckpoint))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.FineTuningCheckpointMetrics))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.FineTuningError))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.FineTuningEvent))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.FineTuningIntegration))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.FineTuningIntegrationWandbWandb))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.FineTuningOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.FineTuningTrainingMethod))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.FunctionCallOutputResponseItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.FunctionCallResponseItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.FunctionChatMessage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.FunctionToolDefinition))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Images.GeneratedImage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Images.GeneratedImageCollection))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.HyperparameterOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.HyperparametersForDPO))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.HyperparametersForSupervised))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Images.ImageEditOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Images.ImageGenerationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Images.ImageInputTokenUsageDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Images.ImageTokenUsage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Images.ImageVariationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.InputAudioClearedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.InputAudioCommittedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.InputAudioSpeechFinishedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.InputAudioSpeechStartedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.InputAudioTranscriptionDeltaUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.InputAudioTranscriptionFailedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.InputAudioTranscriptionFinishedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.InputNoiseReductionOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.InputTranscriptionOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ItemCreatedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ItemDeletedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ItemRetrievedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ItemTruncatedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.MessageContent))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.MessageCreationAttachment))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.MessageCreationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.MessageDeletionResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.MessageFailureDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.MessageModificationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.MessageResponseItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Models.ModelDeletionResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Moderations.ModerationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Moderations.ModerationResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Moderations.ModerationResultCollection))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Embeddings.OpenAIEmbedding))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Embeddings.OpenAIEmbeddingCollection))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Internal.OpenAIError))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Internal.OpenAIErrorResponse))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Files.OpenAIFile))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Files.OpenAIFileCollection))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Models.OpenAIModel))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Models.OpenAIModelCollection))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.OpenAIResponse))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.OutputAudioFinishedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.OutputAudioTranscriptionFinishedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.OutputDeltaUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.OutputPartFinishedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.OutputStreamingFinishedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.OutputStreamingStartedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.OutputTextFinishedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.RateLimitsUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.RealtimeErrorUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.RealtimeItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.RealtimeUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ReasoningResponseItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ReasoningSummaryPart))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ReasoningSummaryTextPart))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ReferenceResponseItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseContentPart))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseCreationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseDeletionResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseError))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ResponseFinishedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseIncompleteStatusDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseInputTokenUsageDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseMessageAnnotation))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseOutputTokenUsageDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseReasoningOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.ResponseStartedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseTextFormat))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseTextOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseTokenUsage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseTool))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.ResponseToolChoice))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunCreationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunError))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunIncompleteDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunModificationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunStep))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunStepCodeInterpreterOutput))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunStepDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunStepError))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunStepFileSearchResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunStepFileSearchResultContent))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunStepTokenUsage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunStepToolCall))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunStepUpdateCodeInterpreterOutput))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunTokenUsage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.RunTruncationStrategy))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Audio.SpeechGenerationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.StaticFileChunkingStrategy))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Audio.StreamingAudioTranscriptionTextDeltaUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Audio.StreamingAudioTranscriptionTextDoneUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Audio.StreamingAudioTranscriptionUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.StreamingChatCompletionUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.StreamingChatFunctionCallUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.StreamingChatOutputAudioUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.StreamingChatToolCallUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseCompletedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseContentPartAddedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseContentPartDoneUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseCreatedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseErrorUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseFailedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseFileSearchCallCompletedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseFileSearchCallInProgressUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseFileSearchCallSearchingUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseFunctionCallArgumentsDeltaUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseFunctionCallArgumentsDoneUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseIncompleteUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseInProgressUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseOutputItemAddedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseOutputItemDoneUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseOutputTextDeltaUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseOutputTextDoneUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseQueuedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseRefusalDeltaUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseRefusalDoneUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseTextAnnotationAddedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseWebSearchCallCompletedUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseWebSearchCallInProgressUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.StreamingResponseWebSearchCallSearchingUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.SystemChatMessage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.ThreadCreationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.ThreadDeletionResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.ThreadMessage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.ThreadModificationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.ThreadRun))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.ToolChatMessage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.ToolConstraint))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.ToolDefinition))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.ToolOutput))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.ToolResources))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.TranscriptionSessionConfiguredUpdate))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.TranscriptionSessionOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.TurnDetectionOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.UnknownAssistantToolDefinition))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.UnknownCreateFineTuningJobRequestIntegration))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.UnknownFineTuningIntegration))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.UnknownMessageContentTextObjectAnnotation))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.UnknownMessageDeltaContent))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.UnknownMessageDeltaTextContentAnnotation))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.UnknownRealtimeClientEvent))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.UnknownRealtimeContentPart))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.UnknownRealtimeRequestItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.UnknownRealtimeRequestMessageItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.UnknownRealtimeResponseItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.UnknownRealtimeServerEvent))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.UnknownRealtimeTool))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.UnknownRealtimeToolChoiceObject))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Realtime.UnknownRealtimeTurnDetection))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.UnknownResponseStreamEvent))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.UnknownRunStepDeltaStepDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.UnknownRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.UnknownRunStepDeltaStepDetailsToolCallsObjectToolCallsObject))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.UnknownRunStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.UnknownRunStepDetailsToolCallsObjectToolCallsObject))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.UnknownRunStepObjectStepDetails))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Chat.UserChatMessage))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.VectorStore))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.VectorStoreBatchFileJob))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Assistants.VectorStoreCreationHelper))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.VectorStoreCreationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.VectorStoreDeletionResult))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.VectorStoreExpirationPolicy))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.VectorStoreFileAssociation))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.VectorStoreFileAssociationError))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.VectorStoreFileCounts))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.VectorStores.VectorStoreModificationOptions))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.WebSearchCallResponseItem))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.Responses.WebSearchUserLocation))]
+    [ModelReaderWriterBuildable(typeof(OpenAI.FineTuning.WeightsAndBiasesIntegration))]
     public partial class OpenAIContext
     {
     }
diff --git a/src/OpenAI.csproj b/src/OpenAI.csproj
index 9a68c0c60..80f0b75f4 100644
--- a/src/OpenAI.csproj
+++ b/src/OpenAI.csproj
@@ -11,7 +11,7 @@
     <VersionPrefix>2.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
 
-    <TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
 
     <!-- Generate an XML documentation file for the project. -->
@@ -81,7 +81,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="System.ClientModel" Version="1.4.2" />
+    <PackageReference Include="System.ClientModel" Version="1.5.1" />
   </ItemGroup>
 
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">