diff --git a/Directory.Build.props b/Directory.Build.props
index 1b26cc0..772f1fd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,10 +19,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Temporalio" Version="1.9.0" />
-    <PackageReference Include="Temporalio.Extensions.DiagnosticSource" Version="1.9.0" />
-    <PackageReference Include="Temporalio.Extensions.Hosting" Version="1.9.0" />
-    <PackageReference Include="Temporalio.Extensions.OpenTelemetry" Version="1.9.0" />
+    <PackageReference Include="Temporalio" Version="1.10.0" />
+    <PackageReference Include="Temporalio.Extensions.DiagnosticSource" Version="1.10.0" />
+    <PackageReference Include="Temporalio.Extensions.Hosting" Version="1.10.0" />
+    <PackageReference Include="Temporalio.Extensions.OpenTelemetry" Version="1.10.0" />
     <!--
     Can also reference the SDK downloaded to a local directory:
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\temporal-sdk-dotnet\src\Temporalio\Temporalio.csproj" />
diff --git a/src/ActivityHeartbeatingCancellation/Program.cs b/src/ActivityHeartbeatingCancellation/Program.cs
index 0741304..983ee6f 100644
--- a/src/ActivityHeartbeatingCancellation/Program.cs
+++ b/src/ActivityHeartbeatingCancellation/Program.cs
@@ -1,16 +1,13 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Exceptions;
 using Temporalio.Worker;
 using TemporalioSamples.ActivityHeartbeatingCancellation;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/ActivitySimple/Program.cs b/src/ActivitySimple/Program.cs
index f5dc8f9..d7ddbf2 100644
--- a/src/ActivitySimple/Program.cs
+++ b/src/ActivitySimple/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.ActivitySimple;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/ActivityWorker/Program.cs b/src/ActivityWorker/Program.cs
index a448575..50a5f2d 100644
--- a/src/ActivityWorker/Program.cs
+++ b/src/ActivityWorker/Program.cs
@@ -1,16 +1,13 @@
 using Temporalio.Activities;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using Temporalio.Workflows;
 using TemporalioSamples.ActivityWorker;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 var client = await TemporalClient.ConnectAsync(connectOptions);
 
 // Create worker
diff --git a/src/AspNet/Web/Program.cs b/src/AspNet/Web/Program.cs
index a123647..39e30be 100644
--- a/src/AspNet/Web/Program.cs
+++ b/src/AspNet/Web/Program.cs
@@ -1,5 +1,5 @@
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using TemporalioSamples.AspNet.Worker;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -15,10 +15,7 @@
     // on separately (VSTHRD003). We may prefer a direct DI extension, see
     // https://github.com/temporalio/sdk-dotnet/issues/46.
     var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-    if (string.IsNullOrEmpty(connectOptions.TargetHost))
-    {
-        connectOptions.TargetHost = "localhost:7233";
-    }
+    connectOptions.TargetHost ??= "localhost:7233";
     connectOptions.LoggerFactory = ctx.GetRequiredService<ILoggerFactory>();
     return TemporalClient.ConnectAsync(connectOptions);
 });
diff --git a/src/Bedrock/Basic/Program.cs b/src/Bedrock/Basic/Program.cs
index 3258e10..3a9deb4 100644
--- a/src/Bedrock/Basic/Program.cs
+++ b/src/Bedrock/Basic/Program.cs
@@ -3,7 +3,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Extensions.Hosting;
 using TemporalioSamples.Bedrock.Basic;
 
@@ -51,10 +51,7 @@ async Task SendMessageAsync()
 async Task<ITemporalClient> CreateClientAsync()
 {
     var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-    if (string.IsNullOrEmpty(connectOptions.TargetHost))
-    {
-        connectOptions.TargetHost = "localhost:7233";
-    }
+    connectOptions.TargetHost ??= "localhost:7233";
     connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
         builder.
             AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/Bedrock/Entity/Program.cs b/src/Bedrock/Entity/Program.cs
index fd1dad2..c9fc403 100644
--- a/src/Bedrock/Entity/Program.cs
+++ b/src/Bedrock/Entity/Program.cs
@@ -3,7 +3,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Extensions.Hosting;
 using TemporalioSamples.Bedrock.Entity;
 
@@ -82,10 +82,7 @@ async Task EndChatAsync()
 async Task<ITemporalClient> CreateClientAsync()
 {
     var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-    if (string.IsNullOrEmpty(connectOptions.TargetHost))
-    {
-        connectOptions.TargetHost = "localhost:7233";
-    }
+    connectOptions.TargetHost ??= "localhost:7233";
     connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
         builder.
             AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/Bedrock/SignalsAndQueries/Program.cs b/src/Bedrock/SignalsAndQueries/Program.cs
index f50802d..1f58036 100644
--- a/src/Bedrock/SignalsAndQueries/Program.cs
+++ b/src/Bedrock/SignalsAndQueries/Program.cs
@@ -3,7 +3,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Extensions.Hosting;
 using TemporalioSamples.Bedrock.SignalsAndQueries;
 
@@ -73,10 +73,7 @@ async Task GetHistoryAsync()
 async Task<ITemporalClient> CreateClientAsync()
 {
     var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-    if (string.IsNullOrEmpty(connectOptions.TargetHost))
-    {
-        connectOptions.TargetHost = "localhost:7233";
-    }
+    connectOptions.TargetHost ??= "localhost:7233";
     connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
         builder.
             AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/ContextPropagation/Program.cs b/src/ContextPropagation/Program.cs
index 8219a2b..3b19e32 100644
--- a/src/ContextPropagation/Program.cs
+++ b/src/ContextPropagation/Program.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Converters;
 using Temporalio.Worker;
 using TemporalioSamples.ContextPropagation;
@@ -13,10 +13,7 @@
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = loggerFactory;
 // This is where we set the interceptor to propagate context
 connectOptions.Interceptors = new[]
diff --git a/src/CounterInterceptor/Program.cs b/src/CounterInterceptor/Program.cs
index 36ad136..20ee0a7 100644
--- a/src/CounterInterceptor/Program.cs
+++ b/src/CounterInterceptor/Program.cs
@@ -1,7 +1,7 @@
 namespace TemporalioSamples.CounterInterceptor;
 
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 
 internal class Program
@@ -10,10 +10,7 @@ private static async Task Main(string[] args)
     {
         var counterInterceptor = new MyCounterInterceptor();
         var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-        if (string.IsNullOrEmpty(connectOptions.TargetHost))
-        {
-            connectOptions.TargetHost = "localhost:7233";
-        }
+        connectOptions.TargetHost ??= "localhost:7233";
         connectOptions.Interceptors = new[]
         {
             counterInterceptor,
diff --git a/src/DependencyInjection/Program.cs b/src/DependencyInjection/Program.cs
index a91303b..90f8143 100644
--- a/src/DependencyInjection/Program.cs
+++ b/src/DependencyInjection/Program.cs
@@ -1,5 +1,5 @@
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Extensions.Hosting;
 using TemporalioSamples.DependencyInjection;
 
@@ -27,10 +27,7 @@ async Task RunWorkerAsync()
 async Task ExecuteWorkflowAsync()
 {
     var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-    if (string.IsNullOrEmpty(connectOptions.TargetHost))
-    {
-        connectOptions.TargetHost = "localhost:7233";
-    }
+    connectOptions.TargetHost ??= "localhost:7233";
     connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
         builder.
             AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/Dsl/Program.cs b/src/Dsl/Program.cs
index 454af8f..11d6f75 100644
--- a/src/Dsl/Program.cs
+++ b/src/Dsl/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.Dsl;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
diff --git a/src/EagerWorkflowStart/Program.cs b/src/EagerWorkflowStart/Program.cs
index 0cd4c71..9304a33 100644
--- a/src/EagerWorkflowStart/Program.cs
+++ b/src/EagerWorkflowStart/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.EagerWorkflowStart;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/Encryption/Starter/Program.cs b/src/Encryption/Starter/Program.cs
index 716ff86..7a6a438 100644
--- a/src/Encryption/Starter/Program.cs
+++ b/src/Encryption/Starter/Program.cs
@@ -1,16 +1,13 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Converters;
 using TemporalioSamples.Encryption.Codec;
 using TemporalioSamples.Encryption.Worker;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.DataConverter = DataConverter.Default with { PayloadCodec = new EncryptionCodec() };
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
diff --git a/src/EnvConfig/LoadFromFile.cs b/src/EnvConfig/LoadFromFile.cs
index be37af3..90755d7 100644
--- a/src/EnvConfig/LoadFromFile.cs
+++ b/src/EnvConfig/LoadFromFile.cs
@@ -1,5 +1,5 @@
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 
 namespace TemporalioSamples.EnvConfig;
 
diff --git a/src/EnvConfig/LoadProfile.cs b/src/EnvConfig/LoadProfile.cs
index d99e1f9..d766343 100644
--- a/src/EnvConfig/LoadProfile.cs
+++ b/src/EnvConfig/LoadProfile.cs
@@ -1,5 +1,5 @@
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 
 namespace TemporalioSamples.EnvConfig;
 
diff --git a/src/Mutex/Program.cs b/src/Mutex/Program.cs
index f4e12fc..7649245 100644
--- a/src/Mutex/Program.cs
+++ b/src/Mutex/Program.cs
@@ -1,15 +1,12 @@
 using System.Diagnostics;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.Mutex;
 using TemporalioSamples.Mutex.Impl;
 
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").SetMinimumLevel(LogLevel.Information));
 var client = await TemporalClient.ConnectAsync(connectOptions);
diff --git a/src/NexusContextPropagation/Program.cs b/src/NexusContextPropagation/Program.cs
index c91e331..7a06ab7 100644
--- a/src/NexusContextPropagation/Program.cs
+++ b/src/NexusContextPropagation/Program.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
 using Temporalio.Client.Interceptors;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Converters;
 using Temporalio.Worker;
 using TemporalioSamples.ContextPropagation;
@@ -26,10 +26,7 @@
 Task<TemporalClient> ConnectClientAsync(string temporalNamespace)
 {
     var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-    if (string.IsNullOrEmpty(connectOptions.TargetHost))
-    {
-        connectOptions.TargetHost = "localhost:7233";
-    }
+    connectOptions.TargetHost ??= "localhost:7233";
     connectOptions.Namespace = temporalNamespace;
     connectOptions.LoggerFactory = loggerFactory;
     connectOptions.Interceptors = new IClientInterceptor[]
diff --git a/src/NexusMultiArg/Program.cs b/src/NexusMultiArg/Program.cs
index b692da3..a1b7fba 100644
--- a/src/NexusMultiArg/Program.cs
+++ b/src/NexusMultiArg/Program.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.NexusMultiArg;
 using TemporalioSamples.NexusMultiArg.Caller;
@@ -23,10 +23,7 @@
 Task<TemporalClient> ConnectClientAsync(string temporalNamespace)
 {
     var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-    if (string.IsNullOrEmpty(connectOptions.TargetHost))
-    {
-        connectOptions.TargetHost = "localhost:7233";
-    }
+    connectOptions.TargetHost ??= "localhost:7233";
     connectOptions.Namespace = temporalNamespace;
     connectOptions.LoggerFactory = loggerFactory;
     return TemporalClient.ConnectAsync(connectOptions);
diff --git a/src/NexusSimple/Program.cs b/src/NexusSimple/Program.cs
index b2ec03b..e4522c4 100644
--- a/src/NexusSimple/Program.cs
+++ b/src/NexusSimple/Program.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.NexusSimple;
 using TemporalioSamples.NexusSimple.Caller;
@@ -23,10 +23,7 @@
 Task<TemporalClient> ConnectClientAsync(string temporalNamespace)
 {
     var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-    if (string.IsNullOrEmpty(connectOptions.TargetHost))
-    {
-        connectOptions.TargetHost = "localhost:7233";
-    }
+    connectOptions.TargetHost ??= "localhost:7233";
     connectOptions.Namespace = temporalNamespace;
     connectOptions.LoggerFactory = loggerFactory;
     return TemporalClient.ConnectAsync(connectOptions);
diff --git a/src/OpenTelemetry/CoreSdkForwarding/Program.cs b/src/OpenTelemetry/CoreSdkForwarding/Program.cs
index c7bc700..55ac58f 100644
--- a/src/OpenTelemetry/CoreSdkForwarding/Program.cs
+++ b/src/OpenTelemetry/CoreSdkForwarding/Program.cs
@@ -4,7 +4,7 @@
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Extensions.OpenTelemetry;
 using Temporalio.Runtime;
 using Temporalio.Worker;
@@ -27,10 +27,7 @@
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/Patching/Program.cs b/src/Patching/Program.cs
index 4c555a2..14e0b1d 100644
--- a/src/Patching/Program.cs
+++ b/src/Patching/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.Patching;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/Polling/Frequent/Program.cs b/src/Polling/Frequent/Program.cs
index 6be90cb..443c16b 100644
--- a/src/Polling/Frequent/Program.cs
+++ b/src/Polling/Frequent/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.Polling.Frequent;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/Polling/Infrequent/Program.cs b/src/Polling/Infrequent/Program.cs
index 14f0c9b..3e894bc 100644
--- a/src/Polling/Infrequent/Program.cs
+++ b/src/Polling/Infrequent/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.Polling.Infrequent;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/Polling/PeriodicSequence/Program.cs b/src/Polling/PeriodicSequence/Program.cs
index ddda882..180430e 100644
--- a/src/Polling/PeriodicSequence/Program.cs
+++ b/src/Polling/PeriodicSequence/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.Polling.PeriodicSequence;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/SafeMessageHandlers/Program.cs b/src/SafeMessageHandlers/Program.cs
index 77443f0..bafe486 100644
--- a/src/SafeMessageHandlers/Program.cs
+++ b/src/SafeMessageHandlers/Program.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Api.Enums.V1;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.SafeMessageHandlers;
 
@@ -11,10 +11,7 @@
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
         SetMinimumLevel(LogLevel.Information));
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = loggerFactory;
 var client = await TemporalClient.ConnectAsync(connectOptions);
 var logger = loggerFactory.CreateLogger<Program>();
diff --git a/src/Saga/Program.cs b/src/Saga/Program.cs
index 008bcd2..990d48f 100644
--- a/src/Saga/Program.cs
+++ b/src/Saga/Program.cs
@@ -1,15 +1,12 @@
 using System.Diagnostics;
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.Saga;
 
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").SetMinimumLevel(LogLevel.Information));
 var client = await TemporalClient.ConnectAsync(connectOptions);
diff --git a/src/Schedules/Program.cs b/src/Schedules/Program.cs
index 9481a13..3374ea4 100644
--- a/src/Schedules/Program.cs
+++ b/src/Schedules/Program.cs
@@ -1,17 +1,14 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Api.Enums.V1;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
 using Temporalio.Client.Schedules;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.Schedules;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/SignalsQueries/Program.cs b/src/SignalsQueries/Program.cs
index 474d2b0..0e00e7e 100644
--- a/src/SignalsQueries/Program.cs
+++ b/src/SignalsQueries/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.SignalsQueries;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/SleepForDays/Program.cs b/src/SleepForDays/Program.cs
index b08c85d..3d18340 100644
--- a/src/SleepForDays/Program.cs
+++ b/src/SleepForDays/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.SleepForDays;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/Timer/Program.cs b/src/Timer/Program.cs
index 8355d2b..b14aecf 100644
--- a/src/Timer/Program.cs
+++ b/src/Timer/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.Timer;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/UpdatableTimer/Program.cs b/src/UpdatableTimer/Program.cs
index b4e7f37..c7d21a9 100644
--- a/src/UpdatableTimer/Program.cs
+++ b/src/UpdatableTimer/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.UpdatableTimer;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/UpdateWithStartEarlyReturn/Program.cs b/src/UpdateWithStartEarlyReturn/Program.cs
index 82c592d..3122be9 100644
--- a/src/UpdateWithStartEarlyReturn/Program.cs
+++ b/src/UpdateWithStartEarlyReturn/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.UpdateWithStartEarlyReturn;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/UpdateWithStartLazyInit/Program.cs b/src/UpdateWithStartLazyInit/Program.cs
index ac677fc..fc7533d 100644
--- a/src/UpdateWithStartLazyInit/Program.cs
+++ b/src/UpdateWithStartLazyInit/Program.cs
@@ -1,17 +1,14 @@
 using System.Globalization;
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Exceptions;
 using Temporalio.Worker;
 using TemporalioSamples.UpdateWithStartLazyInit;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/WorkerSpecificTaskQueues/Program.cs b/src/WorkerSpecificTaskQueues/Program.cs
index 2f3c035..91bf55d 100644
--- a/src/WorkerSpecificTaskQueues/Program.cs
+++ b/src/WorkerSpecificTaskQueues/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.WorkerSpecificTaskQueues;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
diff --git a/src/WorkerVersioning/Program.cs b/src/WorkerVersioning/Program.cs
index 4339b6c..ab6676d 100644
--- a/src/WorkerVersioning/Program.cs
+++ b/src/WorkerVersioning/Program.cs
@@ -1,7 +1,7 @@
 using Temporalio.Api.WorkflowService.V1;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
 using Temporalio.Common;
+using Temporalio.Common.EnvConfig;
 
 namespace TemporalioSamples.WorkerVersioning;
 
@@ -29,10 +29,7 @@ public static async Task Main(string[] args)
         }
 
         var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-        if (string.IsNullOrEmpty(connectOptions.TargetHost))
-        {
-            connectOptions.TargetHost = "localhost:7233";
-        }
+        connectOptions.TargetHost ??= "localhost:7233";
         var client = await TemporalClient.ConnectAsync(connectOptions);
 
         switch (args[0].ToLower())
diff --git a/src/WorkflowUpdate/Program.cs b/src/WorkflowUpdate/Program.cs
index 342aa1e..465b03f 100644
--- a/src/WorkflowUpdate/Program.cs
+++ b/src/WorkflowUpdate/Program.cs
@@ -1,15 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Temporalio.Client;
-using Temporalio.Client.EnvConfig;
+using Temporalio.Common.EnvConfig;
 using Temporalio.Worker;
 using TemporalioSamples.WorkflowUpdate;
 
 // Create a client to localhost on default namespace
 var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
-if (string.IsNullOrEmpty(connectOptions.TargetHost))
-{
-    connectOptions.TargetHost = "localhost:7233";
-}
+connectOptions.TargetHost ??= "localhost:7233";
 connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
     builder.
         AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").