diff --git a/api/OpenAI.net10.0.cs b/api/OpenAI.net10.0.cs
index 72a1a129e..2cc52840a 100644
--- a/api/OpenAI.net10.0.cs
+++ b/api/OpenAI.net10.0.cs
@@ -5026,6 +5026,8 @@ public class CodeInterpreterToolContainer : IJsonModel<CodeInterpreterToolContai
         public ref JsonPatch Patch { get; }
         protected virtual CodeInterpreterToolContainer JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
+        public static implicit operator CodeInterpreterToolContainer(CodeInterpreterToolContainerConfiguration containerConfiguration);
+        public static implicit operator CodeInterpreterToolContainer(string containerId);
         protected virtual CodeInterpreterToolContainer PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
         protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
     }
diff --git a/api/OpenAI.net8.0.cs b/api/OpenAI.net8.0.cs
index 72a1a129e..2cc52840a 100644
--- a/api/OpenAI.net8.0.cs
+++ b/api/OpenAI.net8.0.cs
@@ -5026,6 +5026,8 @@ public class CodeInterpreterToolContainer : IJsonModel<CodeInterpreterToolContai
         public ref JsonPatch Patch { get; }
         protected virtual CodeInterpreterToolContainer JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
+        public static implicit operator CodeInterpreterToolContainer(CodeInterpreterToolContainerConfiguration containerConfiguration);
+        public static implicit operator CodeInterpreterToolContainer(string containerId);
         protected virtual CodeInterpreterToolContainer PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
         protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
     }
diff --git a/api/OpenAI.netstandard2.0.cs b/api/OpenAI.netstandard2.0.cs
index b22cac1e0..ac7e58018 100644
--- a/api/OpenAI.netstandard2.0.cs
+++ b/api/OpenAI.netstandard2.0.cs
@@ -4381,6 +4381,8 @@ public class CodeInterpreterToolContainer : IJsonModel<CodeInterpreterToolContai
         public ref JsonPatch Patch { get; }
         protected virtual CodeInterpreterToolContainer JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
+        public static implicit operator CodeInterpreterToolContainer(CodeInterpreterToolContainerConfiguration containerConfiguration);
+        public static implicit operator CodeInterpreterToolContainer(string containerId);
         protected virtual CodeInterpreterToolContainer PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
         protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
     }
diff --git a/examples/Responses/Example10_CodeInterpreter.cs b/examples/Responses/Example10_CodeInterpreter.cs
index b8c8eab98..e3215cb60 100644
--- a/examples/Responses/Example10_CodeInterpreter.cs
+++ b/examples/Responses/Example10_CodeInterpreter.cs
@@ -24,7 +24,7 @@ public void Example10_CodeInterpreter()
             ResponseItem.CreateUserMessageItem("Create an Excel spreadsheet that contains the mathematical times tables from 1-12 and make it available for download."),
         ];
 
-        CodeInterpreterToolContainer container = new(CodeInterpreterToolContainerConfiguration.CreateAutomaticContainerConfiguration());
+        CodeInterpreterToolContainer container = CodeInterpreterToolContainerConfiguration.CreateAutomaticContainerConfiguration(); // An implicit conversion is used here for convenience.
         CodeInterpreterTool codeInterpreterTool = new(container);
 
         CreateResponseOptions options = new(inputItems)
diff --git a/examples/Responses/Example10_CodeInterpreterAsync.cs b/examples/Responses/Example10_CodeInterpreterAsync.cs
index fcbe0ce3f..96a452b18 100644
--- a/examples/Responses/Example10_CodeInterpreterAsync.cs
+++ b/examples/Responses/Example10_CodeInterpreterAsync.cs
@@ -25,7 +25,7 @@ public async Task Example10_CodeInterpreterAsync()
             ResponseItem.CreateUserMessageItem("Create an Excel spreadsheet that contains the mathematical times tables from 1-12 and make it available for download."),
         ];
 
-        CodeInterpreterToolContainer container = new(CodeInterpreterToolContainerConfiguration.CreateAutomaticContainerConfiguration());
+        CodeInterpreterToolContainer container = CodeInterpreterToolContainerConfiguration.CreateAutomaticContainerConfiguration(); // An implicit conversion is used here for convenience.
         CodeInterpreterTool codeInterpreterTool = new(container);
 
         CreateResponseOptions options = new(inputItems)
diff --git a/src/Custom/Responses/Tools/CodeInterpreterToolContainer.cs b/src/Custom/Responses/Tools/CodeInterpreterToolContainer.cs
index 3cbe291e8..69ca12752 100644
--- a/src/Custom/Responses/Tools/CodeInterpreterToolContainer.cs
+++ b/src/Custom/Responses/Tools/CodeInterpreterToolContainer.cs
@@ -9,13 +9,9 @@ namespace OpenAI.Responses;
 /// Represents a container for the code interpreter tool.
 /// </summary>
 [CodeGenType("DotNetCodeInterpreterToolContainer")]
+[CodeGenVisibility(nameof(CodeInterpreterToolContainer), CodeGenVisibility.Internal)]
 public partial class CodeInterpreterToolContainer
 {
-    // CUSTOM: Made internal.
-    internal CodeInterpreterToolContainer()
-    {
-    }
-
     // CUSTOM: Added to support the corresponding component of the union.
     /// <summary>
     /// Initializes a new instance of the <see cref="CodeInterpreterContainer"/> class.
@@ -23,6 +19,8 @@ internal CodeInterpreterToolContainer()
     /// <param name="containerId">The ID of the container.</param>
     public CodeInterpreterToolContainer(string containerId)
     {
+        Argument.AssertNotNull(containerId, nameof(containerId));
+
         ContainerId = containerId;
     }
 
@@ -33,6 +31,8 @@ public CodeInterpreterToolContainer(string containerId)
     /// <param name="containerConfiguration">The configuration of the container.</param>
     public CodeInterpreterToolContainer(CodeInterpreterToolContainerConfiguration containerConfiguration)
     {
+        Argument.AssertNotNull(containerConfiguration, nameof(containerConfiguration));
+
         ContainerConfiguration = containerConfiguration;
     }
 
@@ -45,4 +45,10 @@ public CodeInterpreterToolContainer(CodeInterpreterToolContainerConfiguration co
     // - Removed setter.
     [CodeGenMember("Container")]
     public CodeInterpreterToolContainerConfiguration ContainerConfiguration { get; }
+
+    // CUSTOM: Added for convenience.
+    public static implicit operator CodeInterpreterToolContainer(string containerId) => containerId is null ? null : new(containerId);
+
+    // CUSTOM: Added for convenience.
+    public static implicit operator CodeInterpreterToolContainer(CodeInterpreterToolContainerConfiguration containerConfiguration) => containerConfiguration is null ? null : new(containerConfiguration);
 }
\ No newline at end of file
diff --git a/src/Custom/Responses/Tools/McpTool/McpToolCallApprovalPolicy.cs b/src/Custom/Responses/Tools/McpTool/McpToolCallApprovalPolicy.cs
index 7ac182230..903783de8 100644
--- a/src/Custom/Responses/Tools/McpTool/McpToolCallApprovalPolicy.cs
+++ b/src/Custom/Responses/Tools/McpTool/McpToolCallApprovalPolicy.cs
@@ -34,5 +34,5 @@ public McpToolCallApprovalPolicy(CustomMcpToolCallApprovalPolicy customPolicy)
     public static implicit operator McpToolCallApprovalPolicy(GlobalMcpToolCallApprovalPolicy globalPolicy) => new(globalPolicy);
 
     // CUSTOM: Added for convenience.
-    public static implicit operator McpToolCallApprovalPolicy(CustomMcpToolCallApprovalPolicy customPolicy) => new(customPolicy);
+    public static implicit operator McpToolCallApprovalPolicy(CustomMcpToolCallApprovalPolicy customPolicy) => customPolicy is null ? null : new(customPolicy);
 }
diff --git a/src/Generated/Models/Responses/CodeInterpreterToolContainer.cs b/src/Generated/Models/Responses/CodeInterpreterToolContainer.cs
index 252af418d..15428b06d 100644
--- a/src/Generated/Models/Responses/CodeInterpreterToolContainer.cs
+++ b/src/Generated/Models/Responses/CodeInterpreterToolContainer.cs
@@ -15,6 +15,10 @@ public partial class CodeInterpreterToolContainer
         [Experimental("SCME0001")]
         private JsonPatch _patch;
 
+        internal CodeInterpreterToolContainer()
+        {
+        }
+
 #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
         internal CodeInterpreterToolContainer(string containerId, CodeInterpreterToolContainerConfiguration containerConfiguration, in JsonPatch patch)
         {
diff --git a/tests/Responses/ResponsesSmokeTests.cs b/tests/Responses/ResponsesSmokeTests.cs
index 918d06200..08f6afc3d 100644
--- a/tests/Responses/ResponsesSmokeTests.cs
+++ b/tests/Responses/ResponsesSmokeTests.cs
@@ -507,7 +507,7 @@ public void SerializeCodeInterpreterToolContainerAsString(bool fromRawJson)
         else
         {
             // We construct a new instance. Later, we serialize it and confirm it was constructed correctly.
-            container = new CodeInterpreterToolContainer(containerId);
+            container = containerId;
         }
 
         BinaryData serializedContainer = ModelReaderWriter.Write(container);
@@ -542,12 +542,10 @@ public void SerializeCodeInterpreterToolContainerAsObject(bool fromRawJson)
         else
         {
             // We construct a new instance. Later, we serialize it and confirm it was constructed correctly.
-            AutomaticCodeInterpreterToolContainerConfiguration autoConfig = new()
+            container = new AutomaticCodeInterpreterToolContainerConfiguration()
             {
                 FileIds = { fileId }
             };
-
-            container = new CodeInterpreterToolContainer(autoConfig);
         }
 
         BinaryData serializedContainer = ModelReaderWriter.Write(container);