diff --git a/UaClientGateway.sln b/UaClientGateway.sln
new file mode 100644
index 0000000..020542b
--- /dev/null
+++ b/UaClientGateway.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 18
+VisualStudioVersion = 18.1.11304.174
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Technosoftware.UaClientGateway", "tools\UaClientGateway\Technosoftware.UaClientGateway.csproj", "{F8CA4A25-A00B-6805-496A-881C91E69BE9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F8CA4A25-A00B-6805-496A-881C91E69BE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8CA4A25-A00B-6805-496A-881C91E69BE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8CA4A25-A00B-6805-496A-881C91E69BE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8CA4A25-A00B-6805-496A-881C91E69BE9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {519D77B6-EA9C-4A11-8248-ABCC01FD533C}
+	EndGlobalSection
+EndGlobal
diff --git a/nuget/packages/Technosoftware.UaSolutions.Client.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.Client.5.0.0-rc.nupkg
new file mode 100644
index 0000000..43991c4
Binary files /dev/null and b/nuget/packages/Technosoftware.UaSolutions.Client.5.0.0-rc.nupkg differ
diff --git a/nuget/packages/Technosoftware.UaSolutions.UaBindings.Https.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaBindings.Https.5.0.0-rc.nupkg
index 5dc1de2..5d6e84f 100644
Binary files a/nuget/packages/Technosoftware.UaSolutions.UaBindings.Https.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaBindings.Https.5.0.0-rc.nupkg differ
diff --git a/nuget/packages/Technosoftware.UaSolutions.UaClient.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaClient.5.0.0-rc.nupkg
index 70e3811..067ab7f 100644
Binary files a/nuget/packages/Technosoftware.UaSolutions.UaClient.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaClient.5.0.0-rc.nupkg differ
diff --git a/nuget/packages/Technosoftware.UaSolutions.UaConfiguration.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaConfiguration.5.0.0-rc.nupkg
index a70911a..0f6fb1d 100644
Binary files a/nuget/packages/Technosoftware.UaSolutions.UaConfiguration.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaConfiguration.5.0.0-rc.nupkg differ
diff --git a/nuget/packages/Technosoftware.UaSolutions.UaCore.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaCore.5.0.0-rc.nupkg
index 398eb23..59c10ff 100644
Binary files a/nuget/packages/Technosoftware.UaSolutions.UaCore.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaCore.5.0.0-rc.nupkg differ
diff --git a/nuget/packages/Technosoftware.UaSolutions.UaServer.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaServer.5.0.0-rc.nupkg
index 178429f..803aa8c 100644
Binary files a/nuget/packages/Technosoftware.UaSolutions.UaServer.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaServer.5.0.0-rc.nupkg differ
diff --git a/nuget/packages/Technosoftware.UaSolutions.UaUtilities.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaUtilities.5.0.0-rc.nupkg
index ea6c03e..e793102 100644
Binary files a/nuget/packages/Technosoftware.UaSolutions.UaUtilities.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaUtilities.5.0.0-rc.nupkg differ
diff --git a/targets.props b/targets.props
index 949d728..8dcd3e5 100644
--- a/targets.props
+++ b/targets.props
@@ -137,6 +137,7 @@
       <PropertyGroup>
         <AppTargetFrameworks>net10.0;net9.0;net8.0;net48</AppTargetFrameworks>
         <AppTargetFramework>net10.0</AppTargetFramework>
+        <UaClientGatewayTargets>net48</UaClientGatewayTargets>		
         <TestsTargetFrameworks>net472;net48;net8.0;net9.0;net10.0</TestsTargetFrameworks>
         <LibTargetFrameworks>net472;net48;net8.0;net9.0;net10.0</LibTargetFrameworks>
         <LibCoreTargetFrameworks>net472;net48;net8.0;net9.0;net10.0</LibCoreTargetFrameworks>
diff --git a/tools/UaClientGateway/App.ico b/tools/UaClientGateway/App.ico
new file mode 100644
index 0000000..5cbc2c8
Binary files /dev/null and b/tools/UaClientGateway/App.ico differ
diff --git a/tools/UaClientGateway/ConsoleUtils.cs b/tools/UaClientGateway/ConsoleUtils.cs
new file mode 100644
index 0000000..e992802
--- /dev/null
+++ b/tools/UaClientGateway/ConsoleUtils.cs
@@ -0,0 +1,361 @@
+#region Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+//-----------------------------------------------------------------------------
+// Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+// Web: https://technosoftware.com 
+//
+// The Software is based on the OPC Foundation MIT License. 
+// The complete license agreement for that can be found here:
+// http://opcfoundation.org/License/MIT/1.00/
+//-----------------------------------------------------------------------------
+#endregion Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+
+#region Using Directives
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Mono.Options;
+using Opc.Ua;
+using Serilog;
+using Serilog.Events;
+using Serilog.Templates;
+#if NET5_0_OR_GREATER
+using Microsoft.Extensions.Configuration;
+#endif
+#endregion Using Directives
+
+namespace Technosoftware.UaClientGateway
+{
+    /// <summary>
+    /// Simple console based telemetry
+    /// </summary>
+    public sealed class ConsoleTelemetry : ITelemetryContext, IDisposable
+    {
+        public ConsoleTelemetry(Action<ILoggingBuilder> configure = null)
+        {
+            LoggerFactory = Microsoft.Extensions.Logging.LoggerFactory
+                .Create(builder =>
+                {
+                    builder.SetMinimumLevel(LogLevel.Information);
+                    configure?.Invoke(builder);
+                })
+                .AddSerilog(Log.Logger);
+
+            ActivitySource = new ActivitySource("SampleCompany", "1.0.0");
+
+            m_logger = LoggerFactory.CreateLogger("Main");
+
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+            TaskScheduler.UnobservedTaskException += Unobserved_TaskException;
+        }
+
+        /// <inheritdoc/>
+        public ILoggerFactory LoggerFactory { get; internal set; }
+
+        /// <inheritdoc/>
+        public Meter CreateMeter()
+        {
+            return new Meter("SampleCompany", "1.0.0");
+        }
+
+        /// <inheritdoc/>
+        public ActivitySource ActivitySource { get; }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            CreateMeter().Dispose();
+            ActivitySource.Dispose();
+            LoggerFactory.Dispose();
+
+            AppDomain.CurrentDomain.UnhandledException -= CurrentDomain_UnhandledException;
+            TaskScheduler.UnobservedTaskException -= Unobserved_TaskException;
+        }
+
+        /// <summary>
+        /// Configure the logging providers.
+        /// </summary>
+        /// <remarks>
+        /// Replaces the Opc.Ua.Core default ILogger with a
+        /// Microsoft.Extension.Logger with a Serilog file, debug and console logger.
+        /// The debug logger is only enabled for debug builds.
+        /// The console logger is enabled by the logConsole flag at the consoleLogLevel.
+        /// The file logger uses the setting in the ApplicationConfiguration.
+        /// The Trace logLevel is chosen if required by the Tracemasks.
+        /// </remarks>
+        /// <param name="configuration">The application configuration.</param>
+        /// <param name="context">The context name for the logger. </param>
+        /// <param name="logConsole">Enable logging to the console.</param>
+        /// <param name="logFile">Enable logging to a file.</param>
+        /// <param name="logApp">Enable application logging.</param>
+        /// <param name="consoleLogLevel">The LogLevel to use for the console/debug.<
+        /// /param>
+        public void ConfigureLogging(
+            ApplicationConfiguration configuration,
+            string context,
+            bool logConsole,
+            bool logFile,
+            bool logApp,
+            LogLevel consoleLogLevel)
+        {
+            if (!logApp)
+            {
+                return;
+            }
+
+            LoggerConfiguration loggerConfiguration = new LoggerConfiguration().Enrich
+                .FromLogContext();
+
+            if (logConsole)
+            {
+                loggerConfiguration.WriteTo.Console(
+                    restrictedToMinimumLevel: (LogEventLevel)consoleLogLevel,
+                    formatProvider: CultureInfo.InvariantCulture);
+            }
+#if DEBUG
+            else
+            {
+                loggerConfiguration.WriteTo.Debug(
+                    restrictedToMinimumLevel: (LogEventLevel)consoleLogLevel,
+                    formatProvider: CultureInfo.InvariantCulture);
+            }
+#endif
+            LogLevel fileLevel = LogLevel.Information;
+
+            // switch for Trace/Verbose output
+            int traceMasks = configuration.TraceConfiguration.TraceMasks;
+            if ((traceMasks &
+                ~(
+                    Utils.TraceMasks.Information |
+                    Utils.TraceMasks.Error |
+                    Utils.TraceMasks.Security |
+                    Utils.TraceMasks.StartStop |
+                    Utils.TraceMasks.StackTrace
+                )) != 0)
+            {
+                fileLevel = LogLevel.Trace;
+            }
+
+            // add file logging if configured
+            if (logFile)
+            {
+                string outputFilePath = configuration.TraceConfiguration.OutputFilePath;
+                if (!string.IsNullOrWhiteSpace(outputFilePath))
+                {
+                    loggerConfiguration.WriteTo.File(
+                        new ExpressionTemplate(
+                            "{UtcDateTime(@t):yyyy-MM-dd HH:mm:ss.fff} [{@l:u3}] {@m}\n{@x}"),
+                        Utils.ReplaceSpecialFolderNames(outputFilePath),
+                        restrictedToMinimumLevel: (LogEventLevel)fileLevel,
+                        rollOnFileSizeLimit: true
+                    );
+                }
+            }
+
+            // adjust minimum level
+            if (fileLevel < LogLevel.Information || consoleLogLevel < LogLevel.Information)
+            {
+                loggerConfiguration.MinimumLevel.Verbose();
+            }
+
+            // create the serilog logger
+            Serilog.Core.Logger serilogger = loggerConfiguration.CreateLogger();
+
+            // create the ILogger for Opc.Ua.Core
+            LoggerFactory = LoggerFactory.AddSerilog(serilogger);
+            m_logger = LoggerFactory.CreateLogger("Main");
+        }
+
+        private void CurrentDomain_UnhandledException(
+            object sender,
+            UnhandledExceptionEventArgs args)
+        {
+            m_logger.LogCritical(
+                args.ExceptionObject as Exception,
+                "Unhandled Exception: (IsTerminating: {IsTerminating})",
+                args.IsTerminating);
+        }
+
+        private void Unobserved_TaskException(
+            object sender,
+            UnobservedTaskExceptionEventArgs args)
+        {
+            m_logger.LogCritical(
+                args.Exception,
+                "Unobserved Task Exception (Observed: {Observed})",
+                args.Observed);
+        }
+
+        private Microsoft.Extensions.Logging.ILogger m_logger;
+    }
+
+    /// <summary>
+    /// The error code why the application exit.
+    /// </summary>
+    public enum ExitCode
+    {
+        Ok = 0,
+        ErrorNotStarted = 0x80,
+        ErrorRunning = 0x81,
+        ErrorException = 0x82,
+        ErrorStopping = 0x83,
+        ErrorCertificate = 0x84,
+        ErrorInvalidCommandLine = 0x100
+    }
+
+    /// <summary>
+    /// An exception that occured and caused an exit of the application.
+    /// </summary>
+    [Serializable]
+    public class ErrorExitException : Exception
+    {
+        public ExitCode ExitCode { get; }
+
+        public ErrorExitException(ExitCode exitCode)
+        {
+            ExitCode = exitCode;
+        }
+
+        public ErrorExitException()
+        {
+            ExitCode = ExitCode.Ok;
+        }
+
+        public ErrorExitException(string message)
+            : base(message)
+        {
+            ExitCode = ExitCode.Ok;
+        }
+
+        public ErrorExitException(string message, ExitCode exitCode)
+            : base(message)
+        {
+            ExitCode = exitCode;
+        }
+
+        public ErrorExitException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+            ExitCode = ExitCode.Ok;
+        }
+
+        public ErrorExitException(string message, Exception innerException, ExitCode exitCode)
+            : base(message, innerException)
+        {
+            ExitCode = exitCode;
+        }
+    }
+
+    /// <summary>
+    /// Helper functions shared in various console applications.
+    /// </summary>
+    public static class ConsoleUtils
+    {
+        /// <summary>
+        /// Process a command line of the console sample application.
+        /// </summary>
+        /// <exception cref="ErrorExitException"></exception>
+        public static string ProcessCommandLine(
+            string[] args,
+            Mono.Options.OptionSet options,
+            ref bool showHelp,
+            string environmentPrefix,
+            bool noExtraArgs = true,
+            TextWriter output = null)
+        {
+            output ??= Console.Out;
+
+#if NET5_0_OR_GREATER
+            // Convert environment settings to command line flags
+            // because in some environments (e.g. docker cloud) it is
+            // the only supported way to pass arguments.
+            IConfigurationRoot config = new ConfigurationBuilder()
+                .AddEnvironmentVariables(environmentPrefix + "_")
+                .Build();
+
+            List<string> argslist = [.. args];
+            foreach (Option option in options)
+            {
+                string[] names = option.GetNames();
+                string longest = names.MaxBy(s => s.Length);
+                if (longest != null && longest.Length >= 3)
+                {
+                    string envKey = config[longest.ToUpperInvariant()];
+                    if (envKey != null)
+                    {
+                        if (string.IsNullOrWhiteSpace(envKey) ||
+                            option.OptionValueType == OptionValueType.None)
+                        {
+                            argslist.Add("--" + longest);
+                        }
+                        else
+                        {
+                            argslist.Add("--" + longest + "=" + envKey);
+                        }
+                    }
+                }
+            }
+            args = [.. argslist];
+#endif
+
+            IList<string> extraArgs = null;
+            try
+            {
+                extraArgs = options.Parse(args);
+                if (noExtraArgs)
+                {
+                    foreach (string extraArg in extraArgs)
+                    {
+                        output.WriteLine("Error: Unknown option: {0}", extraArg);
+                        showHelp = true;
+                    }
+                }
+            }
+            catch (OptionException e)
+            {
+                output.WriteLine(e.Message);
+                showHelp = true;
+            }
+
+            if (showHelp)
+            {
+                options.WriteOptionDescriptions(output);
+                throw new ErrorExitException(
+                    "Invalid Commandline or help requested.",
+                    ExitCode.ErrorInvalidCommandLine
+                );
+            }
+
+            return extraArgs.FirstOrDefault();
+        }
+
+        /// <summary>
+        /// Create an event which is set if a user
+        /// enters the Ctrl-C key combination.
+        /// </summary>
+        public static ManualResetEvent CtrlCHandler(CancellationTokenSource cts)
+        {
+            var quitEvent = new ManualResetEvent(false);
+            try
+            {
+                Console.CancelKeyPress += (_, eArgs) =>
+                {
+                    cts.Cancel();
+                    quitEvent.Set();
+                    eArgs.Cancel = true;
+                };
+            }
+            catch
+            {
+                // intentionally left blank
+            }
+            return quitEvent;
+        }
+    }
+}
diff --git a/tools/UaClientGateway/MyUaServer.cs b/tools/UaClientGateway/MyUaServer.cs
new file mode 100644
index 0000000..0f0e5a8
--- /dev/null
+++ b/tools/UaClientGateway/MyUaServer.cs
@@ -0,0 +1,386 @@
+#region Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+//-----------------------------------------------------------------------------
+// Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+// Web: https://technosoftware.com 
+//
+// The Software is based on the OPC Foundation MIT License. 
+// The complete license agreement for that can be found here:
+// http://opcfoundation.org/License/MIT/1.00/
+//-----------------------------------------------------------------------------
+#endregion Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+
+#region Using Directives
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Opc.Ua;
+using Technosoftware.UaConfiguration;
+using Technosoftware.UaServer;
+#endregion Using Directives
+
+namespace Technosoftware.UaClientGateway
+{
+    /// <summary>
+    /// Main class for the Reference UA server
+    /// </summary>
+    /// <typeparam name="T">Any class based on the UaStandardServer class.</typeparam>
+    public class MyUaServer<T>
+        where T : UaStandardServer, new()
+    {
+        #region Public Properties
+        /// <summary>
+        /// Application instance used by the UA server.
+        /// </summary>
+        public ApplicationInstance Application { get; private set; }
+
+        /// <summary>
+        /// Application configuration used by the UA server.
+        /// </summary>
+        public ApplicationConfiguration Configuration => Application.ApplicationConfiguration;
+
+        /// <summary>
+        /// Specifies whether a certificate is automatically accepted (True) or not (False).
+        /// </summary>
+        public bool AutoAccept { get; set; }
+
+        /// <summary>
+        /// In case the private key is protected by a password it is specified by this property.
+        /// </summary>
+        public char[] Password { get; set; }
+
+        /// <summary>
+        /// The exit code at the time the server stopped.
+        /// </summary>
+        public ExitCode ExitCode { get; private set; }
+
+        /// <summary>
+        /// The server object
+        /// </summary>
+        public T Server { get; private set; }
+        #endregion Public Properties
+
+        #region Constructors, Destructor, Initialization
+        /// <summary>
+        /// Ctor of the server.
+        /// </summary>
+        /// <param name="telemetry">The telemetry context.</param>
+        public MyUaServer(ITelemetryContext telemetry)
+        {
+            m_telemetry = telemetry;
+            m_logger = telemetry.CreateLogger<MyUaServer<T>>();
+        }
+
+        /// <summary>
+        /// Load the application configuration.
+        /// </summary>
+        /// <param name="applicationName">The name of the application.</param>
+        /// <param name="configSectionName">The section name within the configuration.</param>
+        /// <exception cref="ErrorExitException"></exception>
+        public async Task LoadAsync(string applicationName, string configSectionName)
+        {
+            try
+            {
+                ExitCode = ExitCode.ErrorNotStarted;
+
+                ApplicationInstance.MessageDlg = new ApplicationMessageDlg();
+                var passwordProvider = new CertificatePasswordProvider(Password);
+                Application = new ApplicationInstance(m_telemetry)
+                {
+                    ApplicationName = applicationName,
+                    ApplicationType = ApplicationType.Server,
+                    ConfigSectionName = configSectionName,
+                    CertificatePasswordProvider = passwordProvider,
+                    DisableCertificateAutoCreation = false
+                };
+
+                // load the application configuration.
+                await Application.LoadApplicationConfigurationAsync(false).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                throw new ErrorExitException(ex.Message, ExitCode);
+            }
+        }
+
+        /// <summary>
+        /// Load the application configuration.
+        /// </summary>
+        /// <param name="renewCertificate">Specifies whether the certificate should be renewed (true) or not (false)</param>
+        /// <exception cref="ErrorExitException"></exception>
+        public async Task CheckCertificateAsync(bool renewCertificate)
+        {
+            try
+            {
+                ApplicationConfiguration config = Application.ApplicationConfiguration;
+                if (renewCertificate)
+                {
+                    await Application.DeleteApplicationInstanceCertificateAsync().ConfigureAwait(false);
+                }
+
+                // check the application certificate.
+                bool haveAppCertificate = await Application
+                    .CheckApplicationInstanceCertificatesAsync(false)
+                    .ConfigureAwait(false);
+                if (!haveAppCertificate)
+                {
+                    throw new ErrorExitException("Application instance certificate invalid!");
+                }
+
+                if (!config.SecurityConfiguration.AutoAcceptUntrustedCertificates)
+                {
+                    config.CertificateValidator.CertificateValidation += new CertificateValidationEventHandler(
+                        OnCertificateValidation
+                    );
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new ErrorExitException(ex.Message, ExitCode);
+            }
+        }
+
+        /// <summary>
+        /// Create server instance and add node managers.
+        /// </summary>
+        /// <exception cref="ErrorExitException"></exception>
+        public void Create(IList<IUaNodeManagerFactory> nodeManagerFactories)
+        {
+            try
+            {
+                // create the server.
+                Server = new T();
+                if (nodeManagerFactories != null)
+                {
+                    foreach (IUaNodeManagerFactory factory in nodeManagerFactories)
+                    {
+                        Server.AddNodeManager(factory);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new ErrorExitException(ex.Message, ExitCode);
+            }
+        }
+
+        /// <summary>
+        /// Start the server.
+        /// </summary>
+        /// <exception cref="ErrorExitException"></exception>
+        public async Task StartAsync()
+        {
+            try
+            {
+                // create the server.
+                Server ??= new T();
+
+                // start the server
+                await Application.StartAsync(Server).ConfigureAwait(false);
+
+                // save state
+                ExitCode = ExitCode.ErrorRunning;
+
+                // print endpoint info
+                foreach (string endpoint in Application.Server.GetEndpoints().Select(e => e.EndpointUrl).Distinct())
+                {
+                    Console.WriteLine(endpoint);
+                }
+
+                // start the status thread
+                m_status = Task.Run(StatusThreadAsync);
+
+                // print notification on session events
+                Server.CurrentInstance.SessionManager.SessionActivated += OnEventStatus;
+                Server.CurrentInstance.SessionManager.SessionClosing += OnEventStatus;
+                Server.CurrentInstance.SessionManager.SessionCreated += OnEventStatus;
+            }
+            catch (Exception ex)
+            {
+                throw new ErrorExitException(ex.Message, ExitCode);
+            }
+        }
+
+        /// <summary>
+        /// Stops the server.
+        /// </summary>
+        /// <exception cref="ErrorExitException"></exception>
+        public async Task StopAsync()
+        {
+            try
+            {
+                if (Server != null)
+                {
+                    using T server = Server;
+                    // Stop status thread
+                    Server = null;
+                    await m_status.ConfigureAwait(false);
+
+                    // Stop server and dispose
+                    await server.StopAsync().ConfigureAwait(false);
+                }
+
+                ExitCode = ExitCode.Ok;
+            }
+            catch (Exception ex)
+            {
+                throw new ErrorExitException(ex.Message, ExitCode.ErrorStopping);
+            }
+        }
+
+        /// <summary>
+        /// The certificate validator is used
+        /// if auto accept is not selected in the configuration.
+        /// </summary>
+        private void OnCertificateValidation(
+            CertificateValidator validator,
+            CertificateValidationEventArgs e
+        )
+        {
+            if (e.Error.StatusCode == StatusCodes.BadCertificateUntrusted && AutoAccept)
+            {
+                m_logger.LogInformation(
+                    "Accepted Certificate: [{Subject}] [{Thumbprint}]",
+                    e.Certificate.Subject,
+                    e.Certificate.Thumbprint
+                );
+                e.Accept = true;
+                return;
+            }
+            m_logger.LogInformation(
+                "Rejected Certificate: {Error} [{Subject}] [{Thumbprint}]",
+                e.Error,
+                e.Certificate.Subject,
+                e.Certificate.Thumbprint
+            );
+        }
+
+        /// <summary>
+        /// Update the session status.
+        /// </summary>
+        private void OnEventStatus(object sender, SessionEventArgs eventArgs)
+        {
+            IUaSession session = (IUaSession)sender;
+
+            m_lastEventTime = DateTime.UtcNow;
+            LogSessionStatusFull(session, eventArgs.Reason.ToString());
+        }
+
+        /// <summary>
+        /// Output the status of a connected session.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="reason">The reason</param>
+        private void LogSessionStatusLastContact(IUaSession session, string reason)
+        {
+            lock (session.DiagnosticsLock)
+            {
+                m_logger.LogInformation(
+                    "{Reason,9}:{Session,20}:Last Event:{LastContactTime:HH:mm:ss}",
+                    reason,
+                    session.SessionDiagnostics.SessionName,
+                    session.SessionDiagnostics.ClientLastContactTime.ToLocalTime()
+                );
+            }
+        }
+
+        /// <summary>
+        /// Output the status of a connected session.
+        /// </summary>
+        private void LogSessionStatusFull(IUaSession session, string reason)
+        {
+            lock (session.DiagnosticsLock)
+            {
+                m_logger.LogInformation(
+                    "{Reason,9}:{Session,20}:Last Event:{LastContactTime:HH:mm:ss}:{UserIdentity,20}:{SessionId}",
+                    reason,
+                    session.SessionDiagnostics.SessionName,
+                    session.SessionDiagnostics.ClientLastContactTime.ToLocalTime(),
+                    session.Identity?.DisplayName ?? "Anonymous",
+                    session.Id
+                );
+            }
+        }
+
+        /// <summary>
+        /// Status thread, prints connection status every 10 seconds.
+        /// </summary>
+        private async Task StatusThreadAsync()
+        {
+            while (Server != null)
+            {
+                if (DateTime.UtcNow - m_lastEventTime > TimeSpan.FromMilliseconds(10000))
+                {
+                    IList<IUaSession> sessions = Server.CurrentInstance.SessionManager.GetSessions();
+                    for (int ii = 0; ii < sessions.Count; ii++)
+                    {
+                        IUaSession session = sessions[ii];
+                        LogSessionStatusLastContact(session, "-Status-");
+                    }
+                    m_lastEventTime = DateTime.UtcNow;
+                }
+                await Task.Delay(1000).ConfigureAwait(false);
+            }
+        }
+        #endregion Helper Methods
+
+        /// <summary>
+        /// A dialog which asks for user input.
+        /// </summary>
+        public class ApplicationMessageDlg : IUaApplicationMessageDlg
+        {
+            private readonly TextWriter m_output;
+            private string m_message = string.Empty;
+            private bool m_ask;
+
+            public ApplicationMessageDlg(TextWriter output = null)
+            {
+                m_output = output ?? Console.Out;
+            }
+
+            public override void Message(string text, bool ask)
+            {
+                m_message = text;
+                m_ask = ask;
+            }
+
+            public override async Task<bool> ShowAsync()
+            {
+                if (m_ask)
+                {
+                    var message = new StringBuilder(m_message);
+                    message.Append(" (y/n, default y): ");
+                    m_output.Write(message.ToString());
+
+                    try
+                    {
+                        ConsoleKeyInfo result = Console.ReadKey();
+                        m_output.WriteLine();
+                        return await Task.FromResult(result.KeyChar is 'y' or 'Y' or '\r')
+                            .ConfigureAwait(false);
+                    }
+                    catch
+                    {
+                        // intentionally fall through
+                    }
+                }
+                else
+                {
+                    m_output.WriteLine(m_message);
+                }
+
+                return await Task.FromResult(true).ConfigureAwait(false);
+            }
+        }
+
+        #region Private Fields
+        private readonly ITelemetryContext m_telemetry;
+        private readonly ILogger m_logger;
+        private Task m_status;
+        private DateTime m_lastEventTime;
+        #endregion Private Fields
+    }
+}
diff --git a/tools/UaClientGateway/Opc.Ua.CertificateGenerator.exe b/tools/UaClientGateway/Opc.Ua.CertificateGenerator.exe
deleted file mode 100644
index 48446d6..0000000
Binary files a/tools/UaClientGateway/Opc.Ua.CertificateGenerator.exe and /dev/null differ
diff --git a/tools/UaClientGateway/Opc.Ua.Core.dll b/tools/UaClientGateway/Opc.Ua.Core.dll
deleted file mode 100644
index c39e831..0000000
Binary files a/tools/UaClientGateway/Opc.Ua.Core.dll and /dev/null differ
diff --git a/tools/UaClientGateway/Program.cs b/tools/UaClientGateway/Program.cs
new file mode 100644
index 0000000..4fe5f8b
--- /dev/null
+++ b/tools/UaClientGateway/Program.cs
@@ -0,0 +1,195 @@
+#region Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+//-----------------------------------------------------------------------------
+// Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+// Web: https://technosoftware.com 
+//
+// The Software is based on the OPC Foundation MIT License. 
+// The complete license agreement for that can be found here:
+// http://opcfoundation.org/License/MIT/1.00/
+//-----------------------------------------------------------------------------
+#endregion Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+
+#region Using Directives
+using System;
+using System.Globalization;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Opc.Ua;
+using Technosoftware.Client;
+#endregion Using Directives
+
+namespace Technosoftware.UaClientGateway
+{
+    /// <summary>
+    /// The program.
+    /// </summary>
+    public static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        /// <param name="args">The arguments.</param>
+        public static async Task<int> Main(string[] args)
+        {
+            Console.WriteLine("OPC UA Console Reference Server");
+
+            #region License validation
+            //const string licenseData =
+            //        @"";
+            //bool licensed = Technosoftware.UaServer.LicenseHandler.Validate(licenseData);
+            //if (!licensed)
+            //{
+            //    Console.WriteLine("WARNING: No valid license applied.");
+            //}
+
+            string licensedString = $"   Licensed Product     : {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicensedProduct}";
+            Console.WriteLine(licensedString);
+            licensedString = $"   Licensed Features    : {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicensedFeatures}";
+            Console.WriteLine(licensedString);
+            if (Technosoftware.UaUtilities.Licensing.LicenseHandler.IsEvaluation)
+            {
+                licensedString = $"   Evaluation expires at: {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicenseExpirationDate}";
+                Console.WriteLine(licensedString);
+                licensedString = $"   Days until Expiration: {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicenseExpirationDays}";
+                Console.WriteLine(licensedString);
+            }
+            licensedString = $"   Support Included     : {Technosoftware.UaUtilities.Licensing.LicenseHandler.Support}";
+            Console.WriteLine(licensedString);
+            if (Technosoftware.UaUtilities.Licensing.LicenseHandler.Support != Technosoftware.UaUtilities.Licensing.SupportType.None)
+            {
+                licensedString = $"   Support expire at    : {Technosoftware.UaUtilities.Licensing.LicenseHandler.SupportExpirationDate}";
+                Console.WriteLine(licensedString);
+                licensedString = $"   Days until Expiration: {Technosoftware.UaUtilities.Licensing.LicenseHandler.SupportExpirationDays}";
+                Console.WriteLine(licensedString);
+            }
+            if (Technosoftware.UaUtilities.Licensing.LicenseHandler.IsEvaluation)
+            {
+                licensedString = $"   Evaluation Period    : {Technosoftware.UaUtilities.Licensing.LicenseHandler.EvaluationPeriod} minutes.";
+                Console.WriteLine(licensedString);
+            }
+
+            if (!Technosoftware.UaUtilities.Licensing.LicenseHandler.IsLicensed && !Technosoftware.UaUtilities.Licensing.LicenseHandler.IsEvaluation)
+            {
+                Console.WriteLine("ERROR: No valid license applied.");
+            }
+            #endregion License validation
+
+            // The application name and config file name
+            const string applicationName = "Technosoftware.UaClientGateway";
+            const string configSectionName = "Technosoftware.UaClientGateway";
+
+            // command line options
+            bool showHelp = false;
+            bool autoAccept = false;
+            bool logConsole = false;
+            bool appLog = true;
+            bool fileLog = false;
+            bool renewCertificate = false;
+            bool shadowConfig = false;
+            char[] password = null;
+            int timeout = -1;
+
+            string usage = Utils.IsRunningOnMono()
+                ? $"Usage: mono {applicationName}.exe [OPTIONS]"
+                : $"Usage: dotnet {applicationName}.dll [OPTIONS]";
+            var options = new Mono.Options.OptionSet
+            {
+                usage,
+                { "h|help", "show this message and exit", h => showHelp = h != null },
+                { "a|autoaccept", "auto accept certificates (for testing only)", a => autoAccept = a != null },
+                { "c|console", "log to console", c => logConsole = c != null },
+                { "l|log", "log app output", c => appLog = c != null },
+                { "f|file", "log to file", f => fileLog = f != null },
+                { "p|password=", "optional password for private key", p => password = p.ToCharArray() },
+                { "r|renew", "renew application certificate", r => renewCertificate = r != null },
+                { "t|timeout=", "timeout in seconds to exit application", (int t) => timeout = t * 1000 },
+                { "s|shadowconfig", "create configuration in pki root", s => shadowConfig = s != null },
+            };
+
+            using var telemetry = new ConsoleTelemetry();
+            ILogger logger = LoggerUtils.Null.Logger;
+            try
+            {
+                // parse command line and set options
+                ConsoleUtils.ProcessCommandLine(args, options, ref showHelp, "REFSERVER");
+
+                // log console output to logger
+                if (logConsole && appLog)
+                {
+                    logger = telemetry.CreateLogger("Main");
+                }
+
+                // create the UA server
+                var server = new MyUaServer<ComWrapperServer>(telemetry)
+                {
+                    AutoAccept = autoAccept,
+                    Password = password
+                };
+
+                // load the server configuration, validate certificates
+                Console.WriteLine($"Loading configuration from {configSectionName}.");
+                await server.LoadAsync(applicationName, configSectionName).ConfigureAwait(false);
+
+                // use the shadow config to map the config to an externally accessible location
+                if (shadowConfig)
+                {
+                    Console.WriteLine("Using shadow configuration.");
+                    string shadowPath = Directory
+                        .GetParent(
+                            Path.GetDirectoryName(
+                                Utils.ReplaceSpecialFolderNames(server.Configuration.TraceConfiguration.OutputFilePath)
+                            )
+                        )
+                        .FullName;
+                    string shadowFilePath = Path.Combine(
+                        shadowPath,
+                        Path.GetFileName(server.Configuration.SourceFilePath)
+                    );
+                    if (!File.Exists(shadowFilePath))
+                    {
+                        Console.WriteLine("Create a copy of the config in the shadow location.");
+                        File.Copy(server.Configuration.SourceFilePath, shadowFilePath, true);
+                    }
+                    Console.WriteLine($"Reloading configuration from shadow location {shadowFilePath}.");
+                    await server
+                        .LoadAsync(applicationName, Path.Combine(shadowPath, configSectionName))
+                        .ConfigureAwait(false);
+                }
+
+                // setup the logging
+                telemetry.ConfigureLogging(server.Configuration, applicationName, logConsole, fileLog, appLog, LogLevel.Information);
+
+                // check or renew the certificate
+                Console.WriteLine("Check the certificate.");
+                await server.CheckCertificateAsync(renewCertificate).ConfigureAwait(false);
+
+                // Create and add the node managers
+                // server.Create(NodeManagerUtils.NodeManagerFactories);
+
+                // start the server
+                Console.WriteLine("Start the server.");
+                await server.StartAsync().ConfigureAwait(false);
+
+                Console.WriteLine("Server started. Press Ctrl-C to exit...");
+
+                // wait for timeout or Ctrl-C
+                var quitCTS = new CancellationTokenSource();
+                ManualResetEvent quitEvent = ConsoleUtils.CtrlCHandler(quitCTS);
+                bool ctrlc = quitEvent.WaitOne(timeout);
+
+                // stop server. May have to wait for clients to disconnect.
+                Console.WriteLine("Server stopped. Waiting for exit...");
+                await server.StopAsync().ConfigureAwait(false);
+
+                return (int)ExitCode.Ok;
+            }
+            catch (ErrorExitException eee)
+            {
+                Console.WriteLine($"The application exits with error: {eee.Message}");
+                return (int)eee.ExitCode;
+            }
+        }
+    }
+}
diff --git a/tools/UaClientGateway/Properties/AssemblyInfo.cs b/tools/UaClientGateway/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..8c24dad
--- /dev/null
+++ b/tools/UaClientGateway/Properties/AssemblyInfo.cs
@@ -0,0 +1,16 @@
+#region Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+//-----------------------------------------------------------------------------
+// Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+// Web: https://technosoftware.com 
+//
+// The Software is based on the OPC Foundation MIT License. 
+// The complete license agreement for that can be found here:
+// http://opcfoundation.org/License/MIT/1.00/
+//-----------------------------------------------------------------------------
+#endregion Copyright (c) 2022-2026 Technosoftware GmbH. All rights reserved
+
+#region Using Directives
+using System;
+#endregion Using Directives
+
+[assembly: CLSCompliant(false)]
diff --git a/tools/UaClientGateway/README.md b/tools/UaClientGateway/README.md
index d00b309..5ba1cde 100644
--- a/tools/UaClientGateway/README.md
+++ b/tools/UaClientGateway/README.md
@@ -6,10 +6,33 @@ The OPC UA Client Gateway .NET  allows any OPC UA Clients to access Classic OPC
 
 The OPC UA Client Gateway .NET can be configured with an integrated configuration tool. With this tool you can specify the Classic OPC Server to be used as well as starting node (folder) within the UA address space to be used for mapping the Classic OPC Server address space.
 
-## Installation
-
-Use all files from this folder. The executable Technosoftware.UaClientGateway.exe will start the gateway and with the Technosoftware.UaClientGatewayConfigurationTool.exe you can configured the Classic OPC Servers to be used.
-
-The configuration itself is stored in the configuration file Technosoftware.UaClientGateway.Config.xml
+## Configuration
+
+The configuration is done in the Config.xml file as an extension, e.g.:
+
+  <Extensions>
+    <ua:XmlElement>
+      <ComWrapperServerConfiguration xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://opcfoundation.org/UA/SDK/COMInterop">
+        <WrappedServers>
+          <ComClientConfiguration i:type="ComDaClientConfiguration">
+            <ServerUrl>opc.com://localhost/Technosoftware.DaSample</ServerUrl>
+            <ServerName>DA</ServerName>
+            <MaxReconnectWait>100000</MaxReconnectWait>
+            <SeperatorChars></SeperatorChars>
+            <AvailableLocales xmlns:d4p1="http://opcfoundation.org/UA/2008/02/Types.xsd" i:nil="true" />
+            <BrowseToSupported>false</BrowseToSupported>
+          </ComClientConfiguration>
+          <ComClientConfiguration i:type="ComAeClientConfiguration">
+            <ServerUrl>opc.com://localhost/Technosoftware.AeSample</ServerUrl>
+            <ServerName>AE</ServerName>
+            <MaxReconnectWait>100000</MaxReconnectWait>
+            <SeperatorChars></SeperatorChars>
+            <AvailableLocales xmlns:d4p1="http://opcfoundation.org/UA/2008/02/Types.xsd" i:nil="true" />
+          </ComClientConfiguration>
+        </WrappedServers>
+        <ClassicWrapperAddress i:nil="true" />
+      </ComWrapperServerConfiguration>
+    </ua:XmlElement>
+  </Extensions>
 
 
diff --git a/tools/UaClientGateway/Technosoftware.Client.dll b/tools/UaClientGateway/Technosoftware.Client.dll
deleted file mode 100644
index d5d1023..0000000
Binary files a/tools/UaClientGateway/Technosoftware.Client.dll and /dev/null differ
diff --git a/tools/UaClientGateway/Technosoftware.CommonControls.dll b/tools/UaClientGateway/Technosoftware.CommonControls.dll
deleted file mode 100644
index d6d7288..0000000
Binary files a/tools/UaClientGateway/Technosoftware.CommonControls.dll and /dev/null differ
diff --git a/tools/UaClientGateway/Technosoftware.UaClient.dll b/tools/UaClientGateway/Technosoftware.UaClient.dll
deleted file mode 100644
index 9018c70..0000000
Binary files a/tools/UaClientGateway/Technosoftware.UaClient.dll and /dev/null differ
diff --git a/tools/UaClientGateway/Technosoftware.UaClientGateway.Config.xml b/tools/UaClientGateway/Technosoftware.UaClientGateway.Config.xml
index e679997..79b11de 100644
--- a/tools/UaClientGateway/Technosoftware.UaClientGateway.Config.xml
+++ b/tools/UaClientGateway/Technosoftware.UaClientGateway.Config.xml
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ApplicationConfiguration
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:ua="http://opcfoundation.org/UA/2008/02/Types.xsd"
-xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:ua="http://opcfoundation.org/UA/2008/02/Types.xsd"
+  xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
 >
-  
-<!-- A human readable but not necessarily unique name for the application instance -->
+  <!-- A human readable but not necessarily unique name for the application instance -->
   <ApplicationName>Technosoftware OPC UA Client Gateway .NET</ApplicationName>
-  
-<!-- A globally unique identifier for the application instance.
+
+  <!-- A globally unique identifier for the application instance.
        This is overridden with the value contained in the application certificate. -->
   <ApplicationUri>urn:localhost:Technosoftware:UaClientGateway</ApplicationUri>
+
   <!-- A globally unique URI for the product (usually assigned by the product vendor) -->
   <ProductUri>uri:technosoftware.com:UaClientGateway</ProductUri>
-  
-<!-- Indicates the type of application (Server_0, Client_1, ClientAndServer_2 or DiscoveryServer_3). -->
+
+  <!-- Indicates the type of application (Server_0, Client_1, ClientAndServer_2 or DiscoveryServer_3). -->
   <ApplicationType>Server_0</ApplicationType>
-  
-<!-- Specifies security related configuration information -->
+  <!-- Specifies security related configuration information -->
   <SecurityConfiguration>
 
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
-      
-<!-- The type of store. -->
+      <!-- The type of store. -->
       <StoreType>Directory</StoreType>
-      
-<!-- The location of the store. 
+      <!-- The location of the store. 
            Windows store must start with LocalMachine, CurrentUser or CurrentService
            The name of the store is appended.
            Note that the names used in code are difference from what appears in the control panel.
@@ -35,20 +32,18 @@ xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
       <!-- The subject for the certificate 
            Note that subject names are complex structures. Only text that appears here is treated as the CommonName component.
            The first certificate found is used if multiple certificates with the same CommonName and a matching hostname exist.
-           Also a complete distinguished name can be specified here: 'CN=SampleCompany OPC UA Sample Server, DC=localhost'.
+           Also a complete distinguished name can be specified here: 'CN=SampleCompany OPC UA Reference Server, DC=localhost'.
            In this case the first certificate matching the complete distinguished name is used. localhost is replaced with the hostname.
            If no certificate is found, a new self signed application certificate is created.
            The Thumbprint should be specified if the CN or DN does not uniquely identify a certificate. -->
       <SubjectName>CN=Technosoftware OPC UA Client Gateway, C=CH, S=Aargau, O=Technosoftware GmbH, DC=localhost</SubjectName>
-      
-<!-- The SHA1 thumbprint for the certificate.
+      <!-- The SHA1 thumbprint for the certificate.
            The thumbprint uniquely identifies a certificate.
            It should be specified in this file, however, the samples rely on quick and 
            dirty scripts to create new certificate on each machine. A commercial application 
            would generate the initial certificate itself and update the thumbprint accordingly -->
       <!--<Thumbprint>3a35fb798fc6dee8a7e7e4652b0e28fc14c6ee0f</Thumbprint>-->
-      
-</ApplicationCertificate>
+    </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) 
     
@@ -92,17 +87,20 @@ xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
     for easy debugging purposes ONLY and turned off for production deployments! -->
     <AutoAcceptUntrustedCertificates>false</AutoAcceptUntrustedCertificates>
 
-    
-<!-- WARNING: SHA1 signed certificates are by default rejected and should be phased out. 
+    <!-- WARNING: SHA1 signed certificates are by default rejected and should be phased out. 
     The setting below to allow them is only required for UACTT (1.02.336.244) which uses SHA-1 signed certs. -->
-    <RejectSHA1SignedCertificates>false</RejectSHA1SignedCertificates>
+    <RejectSHA1SignedCertificates>true</RejectSHA1SignedCertificates>
+
+    <!-- Value indicating whether certificates with unavailable revocation lists are not accepted -->
+    <RejectUnknownRevocationStatus>true</RejectUnknownRevocationStatus>
+
+    <!-- Value indicating which minimum certificate key strength is accepted -->
     <MinimumCertificateKeySize>2048</MinimumCertificateKeySize>
 
-     <!-- Value indicating whether the application cert should be copied to the trusted store -->
-    <AddAppCertToTrustedStore>true</AddAppCertToTrustedStore>
+    <!-- Value indicating whether the application cert should be copied to the trusted store -->
+    <AddAppCertToTrustedStore>false</AddAppCertToTrustedStore>
 
-    
-<!-- Specifies whether the complete certificate chain should be sent for CA signed certificates. -->
+    <!-- Specifies whether the complete certificate chain should be sent for CA signed certificates. -->
     <SendCertificateChain>true</SendCertificateChain>
 
     <!-- Where the User issuer certificates are stored -->
@@ -162,12 +160,12 @@ xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
          Note that "localhost" is replace with the hostname when the configuration is loaded.
          Additional URLs are created by appending strings to the base address.
          For example, a URL used for an endpoint which uses the Basic256 security policy would look like this:
-         http://localhost:55401/TechnosoftwareUaClientGateway/Basic256 -->
+         https://localhost:55401/TechnosoftwareUaClientGateway/Basic256 -->
     <BaseAddresses>
       <ua:String>opc.tcp://localhost:55400/TechnosoftwareUaClientGateway</ua:String>
+      <ua:String>opc.https://localhost:55401/TechnosoftwareUaClientGateway</ua:String>
     </BaseAddresses>
-    
-<!-- 
+    <!-- 
     These list the alternate addresses (via firewalls, multiple NICs etc.) that can be
     used to communicate with the server. The URL used by the client when calling
     FindServers/GetEndpoints or CreateSession will be used to filter the list of
@@ -186,10 +184,40 @@ xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
     </AlternateBaseAddresses>
     -->
     <SecurityPolicies>
+      <ServerSecurityPolicy>
+        <SecurityMode>SignAndEncrypt_3</SecurityMode>
+        <SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256</SecurityPolicyUri>
+      </ServerSecurityPolicy>
       <ServerSecurityPolicy>
         <SecurityMode>None_1</SecurityMode>
         <SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#None</SecurityPolicyUri>
       </ServerSecurityPolicy>
+      <ServerSecurityPolicy>
+        <SecurityMode>Sign_2</SecurityMode>
+        <SecurityPolicyUri></SecurityPolicyUri>
+      </ServerSecurityPolicy>
+      <ServerSecurityPolicy>
+        <SecurityMode>SignAndEncrypt_3</SecurityMode>
+        <SecurityPolicyUri></SecurityPolicyUri>
+      </ServerSecurityPolicy>
+      <!-- deprecated security policies for reference only
+      <ServerSecurityPolicy>
+        <SecurityMode>Sign_2</SecurityMode>
+        <SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256</SecurityPolicyUri>
+      </ServerSecurityPolicy>
+      <ServerSecurityPolicy>
+        <SecurityMode>SignAndEncrypt_3</SecurityMode>
+        <SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256</SecurityPolicyUri>
+      </ServerSecurityPolicy>
+      <ServerSecurityPolicy>
+        <SecurityMode>Sign_2</SecurityMode>
+        <SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15</SecurityPolicyUri>
+      </ServerSecurityPolicy>
+      <ServerSecurityPolicy>
+        <SecurityMode>SignAndEncrypt_3</SecurityMode>
+        <SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15</SecurityPolicyUri>
+      </ServerSecurityPolicy>
+      -->
     </SecurityPolicies>
 
     <!-- Minimum number of threads assigned to processing requests -->
@@ -206,17 +234,23 @@ xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
       <!-- Allows anonymous users -->
       <ua:UserTokenPolicy>
         <ua:TokenType>Anonymous_0</ua:TokenType>
-        <ua:SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#None</ua:SecurityPolicyUri>
+        <!-- <ua:SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#None</ua:SecurityPolicyUri> -->
       </ua:UserTokenPolicy>
 
       <!-- Allows username/password -->
       <ua:UserTokenPolicy>
         <ua:TokenType>UserName_1</ua:TokenType>
+        <!-- passwords must be encrypted - this specifies what algorithm to use -->
+        <!-- if no algorithm is specified, the active security policy is used -->
+        <!-- <ua:SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256</ua:SecurityPolicyUri> -->
       </ua:UserTokenPolicy>
 
       <!-- Allows user certificates -->
       <ua:UserTokenPolicy>
         <ua:TokenType>Certificate_2</ua:TokenType>
+        <!-- certificate possession must be proven with a digital signature - this specifies what algorithm to use -->
+        <!-- if no algorithm is specified, the active security policy is used -->
+        <!-- <ua:SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256</ua:SecurityPolicyUri> -->
       </ua:UserTokenPolicy>
     </UserTokenPolicies>
 
@@ -225,7 +259,7 @@ xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
     <!-- The maximum number of simultaneous sessions -->
     <MaxSessionCount>75</MaxSessionCount>
 
-<MaxChannelCount>1000</MaxChannelCount>
+    <MaxChannelCount>1000</MaxChannelCount>
     <!-- The minimum session lifetime permitted by the server -->
     <MinSessionTimeout>10000</MinSessionTimeout>
 
@@ -310,9 +344,8 @@ xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
 
     <!-- The maximum interval between registration. 0 disables periodic registration -->
     <MaxRegistrationInterval>0</MaxRegistrationInterval>
-    
-<!-- The file used to save nodes added to the CoreNodeManager. If missing the CoreNodeManger will discard nodes when it stops. -->
-    <NodeManagerSaveFile>Technosoftware.UaClientGateway.Endpoints.xml</NodeManagerSaveFile>
+    <!-- The file used to save nodes added to the CoreNodeManager. If missing the CoreNodeManger will discard nodes when it stops. -->
+    <NodeManagerSaveFile>Technosoftware.UaClientGateway.Nodes.xml</NodeManagerSaveFile>
     <!-- The minimum lifetime for a subscription. -->
     <MinSubscriptionLifetime>10000</MinSubscriptionLifetime>
     <!-- The max publish request count. -->
@@ -321,12 +354,17 @@ xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
     <MaxSubscriptionCount>100</MaxSubscriptionCount>
     <!-- The max size of the event queue. -->
     <MaxEventQueueSize>10000</MaxEventQueueSize>
-
+    <DurableSubscriptionsEnabled>false</DurableSubscriptionsEnabled>
+    <MaxDurableNotificationQueueSize>10000</MaxDurableNotificationQueueSize>
+    <MaxDurableEventQueueSize>10000</MaxDurableEventQueueSize>
+    <MaxDurableSubscriptionLifetimeInHours>10</MaxDurableSubscriptionLifetimeInHours>
     <!-- see https://opcfoundation-onlineapplications.org/profilereporting/ for list of available profiles -->
     <ServerProfileArray>
-      <ua:String>Standard UA Server Profile</ua:String>
-      <ua:String>Data Access Server Facet</ua:String>
-      <ua:String>Method Server Facet</ua:String>
+      <ua:String>http://opcfoundation.org/UA-Profile/Server/StandardUA2017</ua:String>
+      <ua:String>http://opcfoundation.org/UA-Profile/Server/DataAccess</ua:String>
+      <ua:String>http://opcfoundation.org/UA-Profile/Server/Methods</ua:String>
+      <ua:String>http://opcfoundation.org/UA-Profile/Server/ReverseConnect</ua:String>
+      <ua:String>http://opcfoundation.org/UA-Profile/Server/ClientRedundancy</ua:String>
     </ServerProfileArray>
     <ShutdownDelay>5</ShutdownDelay>
     <ServerCapabilities>
@@ -338,11 +376,41 @@ xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
     </SupportedPrivateKeyFormats>
     <MaxTrustListSize>0</MaxTrustListSize>
     <MultiCastDnsEnabled>false</MultiCastDnsEnabled>
+    <!--  Reverse connection parameters sample -->
+    <!--
+    <ReverseConnect>
+      <Clients>
+        <ReverseConnectClient>
+          <EndpointUrl>opc.tcp://localhost:65300</EndpointUrl>
+          <MaxSessionCount>0</MaxSessionCount>
+          <Enabled>true</Enabled>
+        </ReverseConnectClient>
+      </Clients>
+      <ConnectInterval>15000</ConnectInterval>
+      <ConnectTimeout>30000</ConnectTimeout>
+      <RejectTimeout>60000</RejectTimeout>
+    </ReverseConnect>
+    -->
 
+    <OperationLimits>
+      <MaxNodesPerRead>2500</MaxNodesPerRead>
+      <MaxNodesPerHistoryReadData>1000</MaxNodesPerHistoryReadData>
+      <MaxNodesPerHistoryReadEvents>1000</MaxNodesPerHistoryReadEvents>
+      <MaxNodesPerWrite>2500</MaxNodesPerWrite>
+      <MaxNodesPerHistoryUpdateData>1000</MaxNodesPerHistoryUpdateData>
+      <MaxNodesPerHistoryUpdateEvents>1000</MaxNodesPerHistoryUpdateEvents>
+      <MaxNodesPerMethodCall>2500</MaxNodesPerMethodCall>
+      <MaxNodesPerBrowse>2500</MaxNodesPerBrowse>
+      <MaxNodesPerRegisterNodes>2500</MaxNodesPerRegisterNodes>
+      <MaxNodesPerTranslateBrowsePathsToNodeIds>2500</MaxNodesPerTranslateBrowsePathsToNodeIds>
+      <MaxNodesPerNodeManagement>2500</MaxNodesPerNodeManagement>
+      <MaxMonitoredItemsPerCall>2500</MaxMonitoredItemsPerCall>
+    </OperationLimits>
+    <AuditingEnabled>true</AuditingEnabled>
   </ServerConfiguration>
 
-  <Extensions xmlns:d2p1="http://opcfoundation.org/UA/2008/02/Types.xsd">
-    <d2p1:XmlElement>
+  <Extensions>
+    <ua:XmlElement>
       <ComWrapperServerConfiguration xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://opcfoundation.org/UA/SDK/COMInterop">
         <WrappedServers>
           <ComClientConfiguration i:type="ComDaClientConfiguration">
@@ -363,9 +431,10 @@ xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
         </WrappedServers>
         <ClassicWrapperAddress i:nil="true" />
       </ComWrapperServerConfiguration>
-    </d2p1:XmlElement>
+    </ua:XmlElement>
   </Extensions>
 
+
   <!--
   Masks supported by the trace feature. 
   Servers will detect changes within 5 seconds.
@@ -414,21 +483,17 @@ xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
     <!-- Show Only Security and Errors -->
     <!-- <TraceMasks>513</TraceMasks> -->
     <!-- Show Only Security, Errors and Trace -->
-    
-<!-- <TraceMasks>515</TraceMasks> -->
+    <!-- <TraceMasks>515</TraceMasks> -->
     <!-- Show Only Security, COM Calls, Errors and Trace -->
     <!-- <TraceMasks>771</TraceMasks> -->
     <!-- Show Only Security, Service Calls, COM Calls, Errors and Trace -->
-    
-<TraceMasks>779</TraceMasks>
+    <!-- <TraceMasks>779</TraceMasks> -->
     <!-- Show Only Security, Service Calls, Errors and Trace -->
     <!-- <TraceMasks>523</TraceMasks> -->
     <!-- Show Only Security, ServiceResultExceptions, Errors and Trace -->
-    <!-- <TraceMasks>519</TraceMasks> -->
+    <!-- <TraceMasks>519</TraceMasks>  -->
+    <!-- Show Error, Information, StackTrace, Service, ServiceDetail, Operation, OperationDetail, StartStop, ExternalSystem and Security. -->
+    <TraceMasks>1023</TraceMasks>
   </TraceConfiguration>
 
-  <!-- Enables the hi-res clock for the process to allows for shorter (<100ms) publishing and sampling intervals. -->
-  <!-- QueryPerformanceCounter does not work on all multi-core machines so enabling the hi-res clock by default is not recommended. -->
-  <DisableHiResClock>true</DisableHiResClock>
-
 </ApplicationConfiguration>
\ No newline at end of file
diff --git a/tools/UaClientGateway/Technosoftware.UaClientGateway.csproj b/tools/UaClientGateway/Technosoftware.UaClientGateway.csproj
new file mode 100644
index 0000000..2372fd2
--- /dev/null
+++ b/tools/UaClientGateway/Technosoftware.UaClientGateway.csproj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyName>Technosoftware.UaClientGateway</AssemblyName>
+    <TargetFrameworks>$(UaClientGatewayTargets)</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <PackageId>Technosoftware.UaClientGateway</PackageId>
+    <RootNamespace>Technosoftware.UaClientGateway</RootNamespace>
+    <Company>Technosoftware GmbH</Company>
+    <Product>Technosoftware GmbH UA Client Gateway</Product>
+    <Description>Technosoftware GmbH ReferenceServer</Description>
+    <Copyright>Copyright © 2011 - 2026 Technosoftware GmbH</Copyright>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Update="Roslynator.Analyzers" Version="4.15.0" />
+    <PackageReference Update="Roslynator.Formatting.Analyzers" Version="4.15.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.2" />
+    <PackageReference Include="Mono.Options" Version="6.12.0.148" />
+    <PackageReference Include="Serilog" Version="4.3.0" />
+    <PackageReference Include="Serilog.Expressions" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
+    <PackageReference Include="Technosoftware.UaSolutions.UaBindings.Https" Version="5.0.0-rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Technosoftware.UaSolutions.UaUtilities" Version="5.0.0-rc" />
+    <PackageReference Include="Technosoftware.UaSolutions.UaCore" Version="5.0.0-rc" />
+    <PackageReference Include="Technosoftware.UaSolutions.UaConfiguration" Version="5.0.0-rc" />
+    <PackageReference Include="Technosoftware.UaSolutions.UaServer" Version="5.0.0-rc" />
+    <PackageReference Include="Technosoftware.UaSolutions.Client" Version="5.0.0-rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Technosoftware.UaClientGateway.Config.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/tools/UaClientGateway/Technosoftware.UaClientGateway.exe b/tools/UaClientGateway/Technosoftware.UaClientGateway.exe
deleted file mode 100644
index 13d7c80..0000000
Binary files a/tools/UaClientGateway/Technosoftware.UaClientGateway.exe and /dev/null differ
diff --git a/tools/UaClientGateway/Technosoftware.UaClientGateway.exe.config b/tools/UaClientGateway/Technosoftware.UaClientGateway.exe.config
deleted file mode 100644
index d7b3990..0000000
--- a/tools/UaClientGateway/Technosoftware.UaClientGateway.exe.config
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="Technosoftware.UaClientGateway" type="Opc.Ua.ApplicationConfigurationSection,Opc.Ua.Core"/>
-  </configSections>
-  
-  <system.serviceModel>
-    
-    <!-- 
-      UA servers built with the SDK use the Opc.Ua.SessionEndpoint class to implement the ISessionEndpoint 
-      contract. It is possible to add additional behavoirs in the configuration file by referencing this 
-      service. For example, the configuration in this file turns on metadata publishing. 
-    -->
-        
-    <services>
-      <service name="Opc.Ua.SessionEndpoint" behaviorConfiguration="Opc.Ua.SessionEndpoint.Behavior">
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
-      </service>
-    </services>  
-    
-    <!-- Servers deployed in production environments should turn the httpGetEnabled and includeExceptionDetailInFaults options off -->
-    
-    <behaviors>
-      <serviceBehaviors>
-        <behavior name="Opc.Ua.SessionEndpoint.Behavior">
-          <serviceMetadata httpGetEnabled="true"/>
-          <serviceDebug includeExceptionDetailInFaults="true"/>
-        </behavior>
-      </serviceBehaviors>
-    </behaviors>
-
-    <!--
-      Uncommenting this <diagnostics> block will turn on message logging. The contents and the location of the
-      log file are specified in the  <system.diagnostics> block.
-    -->
-
-    <!--
-    <diagnostics>
-      <messageLogging logEntireMessage="true" maxMessagesToLog="3000" logMessagesAtServiceLevel="true" logMalformedMessages="true" logMessagesAtTransportLevel="true"/>
-    </diagnostics>
-    -->
-
-    </system.serviceModel>
-
-  <!--
-  <system.diagnostics>
-		<sources>
-			<source name="System.ServiceModel" switchValue="Verbose, ActivityTracing">
-				<listeners>
-					<add type="System.Diagnostics.DefaultTraceListener" name="Default"/>
-					<add name="ServiceModel Listener"/>
-				</listeners>
-			</source>
-			<source name="System.ServiceModel.MessageLogging">
-				<listeners>
-					<add type="System.Diagnostics.DefaultTraceListener" name="Default"/>
-					<add name="ServiceModel Listener"/>
-				</listeners>
-			</source>
-		</sources>
-		<sharedListeners>
-			<add initializeData="Technosoftware.UaClientGateway.svclog" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="ServiceModel Listener" traceOutputOptions="LogicalOperationStack, DateTime, Timestamp, ProcessId, ThreadId, Callstack"/>
-    </sharedListeners> 
-  </system.diagnostics>
-  -->
-
-  <Technosoftware.UaClientGateway>
-    <ConfigurationLocation xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd">
-      <FilePath>Technosoftware.UaClientGateway.Config.xml</FilePath>
-    </ConfigurationLocation>
-  </Technosoftware.UaClientGateway>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
diff --git a/tools/UaClientGateway/Technosoftware.UaClientGatewayConfigurationTool.Config.xml b/tools/UaClientGateway/Technosoftware.UaClientGatewayConfigurationTool.Config.xml
deleted file mode 100644
index a2eec21..0000000
--- a/tools/UaClientGateway/Technosoftware.UaClientGatewayConfigurationTool.Config.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ApplicationConfiguration
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:ua="http://opcfoundation.org/UA/2008/02/Types.xsd"
-  xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
->
-  <!-- A human readable but not necessarily unique name for the application instance -->
-  <ApplicationName>Technosoftware OPC UA Client Gateway Configuration Tool .NET</ApplicationName>
-  <!-- A globally unique identifier for the application instance.
-       This is overridden with the value contained in the application certificate. -->
-  <ApplicationUri>urn:localhost:TechnosoftwareUaClientGatewayConfigurationTool</ApplicationUri>
-  <!-- A globally unique URI for the product (usually assigned by the product vendor) -->
-  <ProductUri>http://technosoftware.com/TechnosoftwareUaClientGatewayConfigurationTool/</ProductUri>
-  <!-- Indicates the type of application (Client, Server or ClientServer). -->
-  <ApplicationType>Client_1</ApplicationType>
-
-  <!-- Specifies security related configuration information -->
-  <SecurityConfiguration>
-    <!-- Where the application instance certificate is stored (MachineDefault) -->
-    <ApplicationCertificate>
-      <!-- The type of store. -->
-      <StoreType>Directory</StoreType>
-      <!-- The location of the store. 
-           Windows store must start with LocalMachine, CurrentUser or CurrentService
-           The name of the store is appended.
-           Note that the names used in code are difference from what appears in the control panel.
-           e.g. My == "Personal", Root == "Trusted Root Certification Authorities" -->
-      <StorePath>%CommonApplicationData%\Technosoftware\CertificateStores\MachineDefault</StorePath>
-      <!-- The subject for the certificate 
-           Note that subject names are complex structures. The text that appears here is the CommonName component.
-           A complete distinguished would be something like: 'CN=visualXplorer, DC=MACHINENAME'
-           The first certificate found is used if multiple certificates with the same CommonName exist. 
-           The Thumbprint should be specified if the CommonName does not uniquely identify a certificate. -->
-      <SubjectName>Technosoftware OPC UA Client Gateway Configuration Tool .NET</SubjectName>
-      <!-- The SHA1 thumbprint for the certificate.
-           The thumbprint uniquely identifies a certificate.
-           It should be specified in this file, however, the samples rely on quick and 
-           dirty scripts to create new certificate on each machine. A commerical application 
-           would generate the initial certificate itself and update the thumbprint accordingly -->
-      <!--<Thumbprint>3a35fb798fc6dee8a7e7e4652b0e28fc14c6ee0f</Thumbprint>-->
-    </ApplicationCertificate>
-    <!-- The list of trusted certificates. 
-         Some UA applications will use self-signed certificates (certificates without a CA)
-         which means that every application which communicates with it must be configured to 
-         trust it.
-         Adminstrators may designate a certificate store that contains trusted UA application 
-         instance certificates (this store should not be the same as the store used for CAs 
-         certificates). Alternately, Administrators may enter the certificates explicitly in
-         this list.
-         Note that entries in this list may either reference a certificate in the store or
-         may contained the entire certificate encoded as base64 data.
-         -->
-    <TrustedPeerCertificates>
-      <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
-    </TrustedPeerCertificates>
-
-    <!-- The list of certification authorities. 
-         Typical web browsing applications trust any certificate issued by a CA in the 
-         "Trusted Root Certification Authorities" certificate store. However, this approach is 
-         not appropriate for UA because Adminstrators have no control over the CAs that get
-         placed in that Root store to facilitate web browsing. This means Adminstrators must
-         specify a different store that is used only for UA related CAs and/or they must explicitly
-         specify the certificate for each trusted certification authority. -->
-    <TrustedIssuerCertificates>
-      <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\Technosoftware\CertificateStores\UA Certificate Authorities</StorePath>
-    </TrustedIssuerCertificates>
-    <!-- The directory used to store invalid certficates for later review by the administrator. -->
-    <RejectedCertificateStore>
-      <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\Technosoftware\CertificateStores\RejectedCertificates</StorePath>
-    </RejectedCertificateStore>
-    <AutoAcceptUntrustedCertificates>
-      true
-    </AutoAcceptUntrustedCertificates>
-  </SecurityConfiguration>
-
-  <!-- Maps different transports onto a .NET implementation of a WCF Binding
-       WCF bindings are very complex and have many parameters that can be tweeked. To ensure
-       interoperability the SDK has defined 3 standard bindings which can be selected with this
-       element. Developers may define their own Bindings as well provided the inhierit from the 
-       Opc.Ua.Binding.BaseBinding type and implement the same constructor as the built-in binding
-       provide.
-       Note protocols other than HTTP or UA-TCP are not considered to be interoperable -->
-  <TransportConfigurations>
-  </TransportConfigurations>
-
-  <!-- Specifies quotas used to by the transport layer -->
-  <TransportQuotas>
-    <!-- The default timeout in milliseconds for operations (used by clients) -->
-    <OperationTimeout>600000</OperationTimeout>
-    <!-- The maximum length for a string value in any message -->
-    <MaxStringLength>1048576</MaxStringLength>
-    <!-- The maximum length for a byte string value in any message -->
-    <MaxByteStringLength>1048576</MaxByteStringLength>
-    <!-- The maximum length for any array in a message. 
-         Note that some protocols do not distinguish between bytes and arrays. 
-         In these cases the binding will choose the larger of 
-         MaxByteStringLength or MaxArrayLength-->
-    <MaxArrayLength>65535</MaxArrayLength>
-    <!-- The maximum size of any message -->
-    <MaxMessageSize>4194304</MaxMessageSize>
-    <!-- The maximum buffer size 
-         This value controls how big a block of memory the transport layer allocates.
-         Setting this value to a large value will reduce performance and use a lot of RAM -->
-    <MaxBufferSize>65535</MaxBufferSize>
-    <!-- The lifetime of a SecureChannel in milliseconds.
-         This specifies how long the server will keep a broken channel around while waiting 
-         for a client to reconnect.
-         Not used by HTTP or .NET TCP bindings -->
-    <ChannelLifetime>300000</ChannelLifetime>
-    <!-- The lifetime of a SecurityToken in milliseconds.
-         This specifies how long a security token can be used without renewal. -->
-    <SecurityTokenLifetime>3600000</SecurityTokenLifetime>
-  </TransportQuotas>
-
-  <!-- This element is only required for Client and ClientServer applications -->
-  <ClientConfiguration>
-    <!-- The default timeout for new sessions -->
-    <DefaultSessionTimeout>60000</DefaultSessionTimeout>
-    <!-- The well-known URLs for the local discovery servers
-         URLs are tested in the order they appear in this list. -->
-    <WellKnownDiscoveryUrls>
-      <ua:String>opc.tcp://{0}:4840</ua:String>
-      <ua:String>http://{0}:52601/UADiscovery</ua:String>
-      <ua:String>http://{0}/UADiscovery/Default.svc</ua:String>
-    </WellKnownDiscoveryUrls>
-    <DiscoveryServers></DiscoveryServers>
-
-    <!-- The file used to save the EndpointDescriptions for servers known to the Client -->
-    <EndpointCacheFilePath>Technosoftware.UaClientGatewayConfigurationTool.Endpoints.xml</EndpointCacheFilePath>
-    <!-- The minimum subscription lifetime.
-	This ensures subscriptions are not set to expire too quickly. The requesed lifetime count
-	and keep alive count are calculated using this value and the request publishing interval -->
-    <MinSubscriptionLifetime>10000</MinSubscriptionLifetime>
-  </ClientConfiguration>
-
-  <Extensions>
-  </Extensions>
-
-  <!--
-    Masks supported by the trace feature. 
-    Servers will detect changes within 5 seconds.
-    Do not output any messages.
-    None = 0x0;
-    Output error messages.
-    Error = 0x1;
-    Output informational messages.
-    Information = 0x2;
-    Output stack traces.
-    StackTrace = 0x4;
-    Output basic messages for service calls.
-    Service = 0x8;
-    Output detailed messages for service calls.
-    ServiceDetail = 0x10;
-    Output basic messages for each operation.
-    Operation = 0x20;
-    Output detailed messages for each operation.
-    OperationDetail = 0x40;
-    Output messages related to application initialization or shutdown
-    StartStop = 0x80;
-    Output messages related to a call to an external system.
-    ExternalSystem = 0x100;
-    Output messages related to security
-    Security = 0x200;
-  -->
-
-  <TraceConfiguration>
-    <OutputFilePath>Logs\Technosoftware.UaClientGatewayConfigurationTool.log</OutputFilePath>
-    <DeleteOnLoad>true</DeleteOnLoad>
-    <!-- Show Only Errors -->
-    <!-- <TraceMasks>1</TraceMasks> -->
-    <!-- Show Only Security and Errors -->
-    <!-- <TraceMasks>513</TraceMasks> -->
-    <!-- Show Only Security, Errors and Trace -->
-    <!-- <TraceMasks>515</TraceMasks> -->
-    <!-- Show Only Security, COM Calls, Errors and Trace -->
-    <TraceMasks>771</TraceMasks>
-    <!-- Show Only Security, Service Calls, Errors and Trace -->
-    <!-- <TraceMasks>523</TraceMasks> -->
-    <!-- Show Only Security, ServiceResultExceptions, Errors and Trace -->
-    <!-- <TraceMasks>519</TraceMasks> -->
-  </TraceConfiguration>
-
-  <!-- Enables the hi-res clock for the process to allows for shorter (<100ms) publishing and sampling intervals. -->
-  <!-- QueryPerformanceCounter does not work on all multi-core machines so enabling the hi-res clock by default is not recommended. -->
-  <DisableHiResClock>true</DisableHiResClock>
-
-</ApplicationConfiguration>
\ No newline at end of file
diff --git a/tools/UaClientGateway/Technosoftware.UaClientGatewayConfigurationTool.exe b/tools/UaClientGateway/Technosoftware.UaClientGatewayConfigurationTool.exe
deleted file mode 100644
index d4e6022..0000000
Binary files a/tools/UaClientGateway/Technosoftware.UaClientGatewayConfigurationTool.exe and /dev/null differ
diff --git a/tools/UaClientGateway/Technosoftware.UaClientGatewayConfigurationTool.exe.config b/tools/UaClientGateway/Technosoftware.UaClientGatewayConfigurationTool.exe.config
deleted file mode 100644
index f504860..0000000
--- a/tools/UaClientGateway/Technosoftware.UaClientGatewayConfigurationTool.exe.config
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="Technosoftware.ConfigurationTool" type="Opc.Ua.ApplicationConfigurationSection,Opc.Ua.Core"/>
-  </configSections>
-
-  <system.serviceModel>
-
-    <!--
-      Uncommenting this <diagnostics> block will turn on message logging. The contents and the location of the
-      log file are specified in the  <system.diagnostics> block.
-    -->
-
-    <!--
-    <diagnostics>
-      <messageLogging logEntireMessage="true" maxMessagesToLog="3000" logMessagesAtServiceLevel="true" logMalformedMessages="true" logMessagesAtTransportLevel="true"/>
-    </diagnostics>
-    -->
-
-  </system.serviceModel>
-
-  <!--
-  <system.diagnostics>
-		<sources>
-			<source name="System.ServiceModel" switchValue="Verbose, ActivityTracing">
-				<listeners>
-					<add type="System.Diagnostics.DefaultTraceListener" name="Default"/>
-					<add name="ServiceModel Listener"/>
-				</listeners>
-			</source>
-			<source name="System.ServiceModel.MessageLogging">
-				<listeners>
-					<add type="System.Diagnostics.DefaultTraceListener" name="Default"/>
-					<add name="ServiceModel Listener"/>
-				</listeners>
-			</source>
-		</sources>
-		<sharedListeners>
-			<add initializeData="Technosoftware40.ConfigurationTool.svclog" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="ServiceModel Listener" traceOutputOptions="LogicalOperationStack, DateTime, Timestamp, ProcessId, ThreadId, Callstack"/>
-    </sharedListeners> 
-  </system.diagnostics>
-  -->
-
-  <Technosoftware.ConfigurationTool>
-    <ConfigurationLocation xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd">
-      <FilePath>Technosoftware.UaClientGatewayConfigurationTool.Config.xml</FilePath>
-    </ConfigurationLocation>
-  </Technosoftware.ConfigurationTool>
-  
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
diff --git a/tools/UaClientGateway/Technosoftware.UaConfiguration.dll b/tools/UaClientGateway/Technosoftware.UaConfiguration.dll
deleted file mode 100644
index 1cf5d59..0000000
Binary files a/tools/UaClientGateway/Technosoftware.UaConfiguration.dll and /dev/null differ
diff --git a/tools/UaClientGateway/Technosoftware.UaServer.dll b/tools/UaClientGateway/Technosoftware.UaServer.dll
deleted file mode 100644
index 67b0ff5..0000000
Binary files a/tools/UaClientGateway/Technosoftware.UaServer.dll and /dev/null differ