diff --git a/src/libs/Helicone/Generated/Helicone.AgentClient.g.cs b/src/libs/Helicone/Generated/Helicone.AgentClient.g.cs
index 84682b03..fd1233a1 100644
--- a/src/libs/Helicone/Generated/Helicone.AgentClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.AgentClient.g.cs
@@ -132,10 +132,7 @@ public AgentClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.ApiKeyClient.g.cs b/src/libs/Helicone/Generated/Helicone.ApiKeyClient.g.cs
index cc417f87..893d1991 100644
--- a/src/libs/Helicone/Generated/Helicone.ApiKeyClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.ApiKeyClient.g.cs
@@ -132,10 +132,7 @@ public ApiKeyClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.ComparisonClient.g.cs b/src/libs/Helicone/Generated/Helicone.ComparisonClient.g.cs
index 4e5f10cc..6ce2ee90 100644
--- a/src/libs/Helicone/Generated/Helicone.ComparisonClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.ComparisonClient.g.cs
@@ -132,10 +132,7 @@ public ComparisonClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.CreditsClient.g.cs b/src/libs/Helicone/Generated/Helicone.CreditsClient.g.cs
index 884078fd..2199f355 100644
--- a/src/libs/Helicone/Generated/Helicone.CreditsClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.CreditsClient.g.cs
@@ -132,10 +132,7 @@ public CreditsClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.CustomerClient.g.cs b/src/libs/Helicone/Generated/Helicone.CustomerClient.g.cs
index feef7dda..803a10f8 100644
--- a/src/libs/Helicone/Generated/Helicone.CustomerClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.CustomerClient.g.cs
@@ -132,10 +132,7 @@ public CustomerClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.DashboardClient.g.cs b/src/libs/Helicone/Generated/Helicone.DashboardClient.g.cs
index a58042f4..99206f79 100644
--- a/src/libs/Helicone/Generated/Helicone.DashboardClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.DashboardClient.g.cs
@@ -132,10 +132,7 @@ public DashboardClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.DatasetClient.g.cs b/src/libs/Helicone/Generated/Helicone.DatasetClient.g.cs
index 46326146..dec98d72 100644
--- a/src/libs/Helicone/Generated/Helicone.DatasetClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.DatasetClient.g.cs
@@ -132,10 +132,7 @@ public DatasetClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.EvalsClient.g.cs b/src/libs/Helicone/Generated/Helicone.EvalsClient.g.cs
index 8e1376e3..47f0381e 100644
--- a/src/libs/Helicone/Generated/Helicone.EvalsClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.EvalsClient.g.cs
@@ -132,10 +132,7 @@ public EvalsClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.EvaluatorClient.g.cs b/src/libs/Helicone/Generated/Helicone.EvaluatorClient.g.cs
index 1793881a..32d7b624 100644
--- a/src/libs/Helicone/Generated/Helicone.EvaluatorClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.EvaluatorClient.g.cs
@@ -132,10 +132,7 @@ public EvaluatorClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.ExperimentClient.g.cs b/src/libs/Helicone/Generated/Helicone.ExperimentClient.g.cs
index 39be81ee..12358640 100644
--- a/src/libs/Helicone/Generated/Helicone.ExperimentClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.ExperimentClient.g.cs
@@ -132,10 +132,7 @@ public ExperimentClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.HeliconeClient.g.cs b/src/libs/Helicone/Generated/Helicone.HeliconeClient.g.cs
index 49531b4e..0562a478 100644
--- a/src/libs/Helicone/Generated/Helicone.HeliconeClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.HeliconeClient.g.cs
@@ -462,10 +462,7 @@ public HeliconeClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -578,7 +575,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.HeliconeSqlClient.g.cs b/src/libs/Helicone/Generated/Helicone.HeliconeSqlClient.g.cs
index c6beda5e..3a58b38b 100644
--- a/src/libs/Helicone/Generated/Helicone.HeliconeSqlClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.HeliconeSqlClient.g.cs
@@ -132,10 +132,7 @@ public HeliconeSqlClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.IntegrationClient.g.cs b/src/libs/Helicone/Generated/Helicone.IntegrationClient.g.cs
index c9bfda5f..d8cc3ad5 100644
--- a/src/libs/Helicone/Generated/Helicone.IntegrationClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.IntegrationClient.g.cs
@@ -132,10 +132,7 @@ public IntegrationClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.MetricsClient.g.cs b/src/libs/Helicone/Generated/Helicone.MetricsClient.g.cs
index 9c81f364..c8de7321 100644
--- a/src/libs/Helicone/Generated/Helicone.MetricsClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.MetricsClient.g.cs
@@ -132,10 +132,7 @@ public MetricsClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.ModelRegistryClient.g.cs b/src/libs/Helicone/Generated/Helicone.ModelRegistryClient.g.cs
index abe4948e..659f8dd3 100644
--- a/src/libs/Helicone/Generated/Helicone.ModelRegistryClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.ModelRegistryClient.g.cs
@@ -132,10 +132,7 @@ public ModelRegistryClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.ModelsClient.g.cs b/src/libs/Helicone/Generated/Helicone.ModelsClient.g.cs
index f2aee4fd..48d763bf 100644
--- a/src/libs/Helicone/Generated/Helicone.ModelsClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.ModelsClient.g.cs
@@ -132,10 +132,7 @@ public ModelsClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.PiClient.g.cs b/src/libs/Helicone/Generated/Helicone.PiClient.g.cs
index 9d4b8367..03269f2a 100644
--- a/src/libs/Helicone/Generated/Helicone.PiClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.PiClient.g.cs
@@ -132,10 +132,7 @@ public PiClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.PlaygroundClient.g.cs b/src/libs/Helicone/Generated/Helicone.PlaygroundClient.g.cs
index 08e2509d..190f1daf 100644
--- a/src/libs/Helicone/Generated/Helicone.PlaygroundClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.PlaygroundClient.g.cs
@@ -132,10 +132,7 @@ public PlaygroundClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.Prompt2025Client.g.cs b/src/libs/Helicone/Generated/Helicone.Prompt2025Client.g.cs
index 38952019..a239e692 100644
--- a/src/libs/Helicone/Generated/Helicone.Prompt2025Client.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.Prompt2025Client.g.cs
@@ -132,10 +132,7 @@ public Prompt2025Client(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.Prompt2025V2Client.g.cs b/src/libs/Helicone/Generated/Helicone.Prompt2025V2Client.g.cs
index f042495b..8d8edb0d 100644
--- a/src/libs/Helicone/Generated/Helicone.Prompt2025V2Client.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.Prompt2025V2Client.g.cs
@@ -132,10 +132,7 @@ public Prompt2025V2Client(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.PromptClient.g.cs b/src/libs/Helicone/Generated/Helicone.PromptClient.g.cs
index 3eb1033f..a80dcc64 100644
--- a/src/libs/Helicone/Generated/Helicone.PromptClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.PromptClient.g.cs
@@ -132,10 +132,7 @@ public PromptClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.PropertyClient.g.cs b/src/libs/Helicone/Generated/Helicone.PropertyClient.g.cs
index fca1d8c4..aef622d1 100644
--- a/src/libs/Helicone/Generated/Helicone.PropertyClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.PropertyClient.g.cs
@@ -132,10 +132,7 @@ public PropertyClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.ProvidersClient.g.cs b/src/libs/Helicone/Generated/Helicone.ProvidersClient.g.cs
index 98768f96..5c341d89 100644
--- a/src/libs/Helicone/Generated/Helicone.ProvidersClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.ProvidersClient.g.cs
@@ -132,10 +132,7 @@ public ProvidersClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.RequestClient.g.cs b/src/libs/Helicone/Generated/Helicone.RequestClient.g.cs
index 3579d03b..c7236d9e 100644
--- a/src/libs/Helicone/Generated/Helicone.RequestClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.RequestClient.g.cs
@@ -132,10 +132,7 @@ public RequestClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.SecurityClient.g.cs b/src/libs/Helicone/Generated/Helicone.SecurityClient.g.cs
index 286223a9..22240894 100644
--- a/src/libs/Helicone/Generated/Helicone.SecurityClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.SecurityClient.g.cs
@@ -132,10 +132,7 @@ public SecurityClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.SessionClient.g.cs b/src/libs/Helicone/Generated/Helicone.SessionClient.g.cs
index 02a5cea2..d387d425 100644
--- a/src/libs/Helicone/Generated/Helicone.SessionClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.SessionClient.g.cs
@@ -132,10 +132,7 @@ public SessionClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.StatusClient.g.cs b/src/libs/Helicone/Generated/Helicone.StatusClient.g.cs
index 539bef58..8f125b15 100644
--- a/src/libs/Helicone/Generated/Helicone.StatusClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.StatusClient.g.cs
@@ -132,10 +132,7 @@ public StatusClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.StripeClient.g.cs b/src/libs/Helicone/Generated/Helicone.StripeClient.g.cs
index 8ecf9eba..9519718c 100644
--- a/src/libs/Helicone/Generated/Helicone.StripeClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.StripeClient.g.cs
@@ -132,10 +132,7 @@ public StripeClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.TestClient.g.cs b/src/libs/Helicone/Generated/Helicone.TestClient.g.cs
index 325699e6..1e702d65 100644
--- a/src/libs/Helicone/Generated/Helicone.TestClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.TestClient.g.cs
@@ -132,10 +132,7 @@ public TestClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.TraceClient.g.cs b/src/libs/Helicone/Generated/Helicone.TraceClient.g.cs
index f6bf4b1f..de750704 100644
--- a/src/libs/Helicone/Generated/Helicone.TraceClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.TraceClient.g.cs
@@ -132,10 +132,7 @@ public TraceClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.UserClient.g.cs b/src/libs/Helicone/Generated/Helicone.UserClient.g.cs
index 4b2fb093..7e9cc780 100644
--- a/src/libs/Helicone/Generated/Helicone.UserClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.UserClient.g.cs
@@ -132,10 +132,7 @@ public UserClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.VaultClient.g.cs b/src/libs/Helicone/Generated/Helicone.VaultClient.g.cs
index b11bd408..2a3e3dd0 100644
--- a/src/libs/Helicone/Generated/Helicone.VaultClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.VaultClient.g.cs
@@ -132,10 +132,7 @@ public VaultClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.WebhooksClient.g.cs b/src/libs/Helicone/Generated/Helicone.WebhooksClient.g.cs
index e320f433..6f9888be 100644
--- a/src/libs/Helicone/Generated/Helicone.WebhooksClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.WebhooksClient.g.cs
@@ -132,10 +132,7 @@ public WebhooksClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/Helicone/Generated/Helicone.WrappedClient.g.cs b/src/libs/Helicone/Generated/Helicone.WrappedClient.g.cs
index e0387cfb..377eda8a 100644
--- a/src/libs/Helicone/Generated/Helicone.WrappedClient.g.cs
+++ b/src/libs/Helicone/Generated/Helicone.WrappedClient.g.cs
@@ -132,10 +132,7 @@ public WrappedClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            if (baseUri is not null)
-            {
-                HttpClient.BaseAddress ??= baseUri;
-            }
+            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::Helicone.EndPointAuthorization>();
             Options = options ?? new global::Helicone.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +245,7 @@ private void SelectServer(global::Helicone.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
+            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
         }
 
         private global::System.Uri? ResolveBaseUri(