diff --git a/src/LocalStack.AwsLocal/AmbientContexts/ConsoleContext.cs b/src/LocalStack.AwsLocal/AmbientContexts/ConsoleContext.cs
index 5b168fe..94ffac5 100644
--- a/src/LocalStack.AwsLocal/AmbientContexts/ConsoleContext.cs
+++ b/src/LocalStack.AwsLocal/AmbientContexts/ConsoleContext.cs
@@ -1,23 +1,20 @@
-using System;
+namespace LocalStack.AwsLocal.AmbientContexts;
 
-namespace LocalStack.AwsLocal.AmbientContexts
+public abstract class ConsoleContext
 {
-    public abstract class ConsoleContext
-    {
-        private static ConsoleContext _current = DefaultConsoleContext.Instance;
+    private static ConsoleContext _current = DefaultConsoleContext.Instance;
 
-        public static ConsoleContext Current
-        {
-            get => _current;
+    public static ConsoleContext Current
+    {
+        get => _current;
 
-            set => _current = value ?? throw new ArgumentNullException(nameof(value));
-        }
+        set => _current = value ?? throw new ArgumentNullException(nameof(value));
+    }
 
-        public abstract void WriteLine(string text);
+    public abstract void WriteLine(string text);
 
-        public static void ResetToDefault()
-        {
-            _current = DefaultConsoleContext.Instance;
-        }
+    public static void ResetToDefault()
+    {
+        _current = DefaultConsoleContext.Instance;
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/AmbientContexts/DefaultConsoleContext.cs b/src/LocalStack.AwsLocal/AmbientContexts/DefaultConsoleContext.cs
index a0997a8..dd52f78 100644
--- a/src/LocalStack.AwsLocal/AmbientContexts/DefaultConsoleContext.cs
+++ b/src/LocalStack.AwsLocal/AmbientContexts/DefaultConsoleContext.cs
@@ -1,16 +1,13 @@
-using System;
+namespace LocalStack.AwsLocal.AmbientContexts;
 
-namespace LocalStack.AwsLocal.AmbientContexts
+public class DefaultConsoleContext : ConsoleContext
 {
-    public class DefaultConsoleContext : ConsoleContext
-    {
-        private static readonly Lazy<DefaultConsoleContext> LazyInstance = new Lazy<DefaultConsoleContext>(() => new DefaultConsoleContext());
-
-        public override void WriteLine(string text)
-        {
-            Console.WriteLine(text);
-        }
+    private static readonly Lazy<DefaultConsoleContext> LazyInstance = new(() => new DefaultConsoleContext());
 
-        public static DefaultConsoleContext Instance => LazyInstance.Value;
+    public override void WriteLine(string text)
+    {
+        Console.WriteLine(text);
     }
+
+    public static DefaultConsoleContext Instance => LazyInstance.Value;
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/AmbientContexts/DefaultEnvironmentContext.cs b/src/LocalStack.AwsLocal/AmbientContexts/DefaultEnvironmentContext.cs
index 396e97a..08306e1 100644
--- a/src/LocalStack.AwsLocal/AmbientContexts/DefaultEnvironmentContext.cs
+++ b/src/LocalStack.AwsLocal/AmbientContexts/DefaultEnvironmentContext.cs
@@ -1,16 +1,13 @@
-using System;
+namespace LocalStack.AwsLocal.AmbientContexts;
 
-namespace LocalStack.AwsLocal.AmbientContexts
+public class DefaultEnvironmentContext : EnvironmentContext
 {
-    public class DefaultEnvironmentContext : EnvironmentContext
-    {
-        private static readonly Lazy<DefaultEnvironmentContext> LazyInstance = new Lazy<DefaultEnvironmentContext>(() => new DefaultEnvironmentContext());
-
-        public override void Exit(int value)
-        {
-            Environment.Exit(value);
-        }
+    private static readonly Lazy<DefaultEnvironmentContext> LazyInstance = new(valueFactory: () => new DefaultEnvironmentContext());
 
-        public static DefaultEnvironmentContext Instance => LazyInstance.Value;
+    public override void Exit(int value)
+    {
+        Environment.Exit(value);
     }
+
+    public static DefaultEnvironmentContext Instance => LazyInstance.Value;
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/AmbientContexts/EnvironmentContext.cs b/src/LocalStack.AwsLocal/AmbientContexts/EnvironmentContext.cs
index 6d0b3d6..3681117 100644
--- a/src/LocalStack.AwsLocal/AmbientContexts/EnvironmentContext.cs
+++ b/src/LocalStack.AwsLocal/AmbientContexts/EnvironmentContext.cs
@@ -1,23 +1,20 @@
-using System;
+namespace LocalStack.AwsLocal.AmbientContexts;
 
-namespace LocalStack.AwsLocal.AmbientContexts
+public abstract class EnvironmentContext
 {
-    public abstract class EnvironmentContext
-    {
-        private static EnvironmentContext _current = DefaultEnvironmentContext.Instance;
+    private static EnvironmentContext _current = DefaultEnvironmentContext.Instance;
 
-        public static EnvironmentContext Current
-        {
-            get => _current;
+    public static EnvironmentContext Current
+    {
+        get => _current;
 
-            set => _current = value ?? throw new ArgumentNullException(nameof(value));
-        }
+        set => _current = value ?? throw new ArgumentNullException(nameof(value));
+    }
 
-        public abstract void Exit(int value);
+    public abstract void Exit(int value);
 
-        public static void ResetToDefault()
-        {
-            _current = DefaultEnvironmentContext.Instance;
-        }
+    public static void ResetToDefault()
+    {
+        _current = DefaultEnvironmentContext.Instance;
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/CommandDispatcher.cs b/src/LocalStack.AwsLocal/CommandDispatcher.cs
index d958c9b..db412cd 100644
--- a/src/LocalStack.AwsLocal/CommandDispatcher.cs
+++ b/src/LocalStack.AwsLocal/CommandDispatcher.cs
@@ -1,184 +1,168 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using LocalStack.AwsLocal.AmbientContexts;
-using LocalStack.AwsLocal.Contracts;
-using LocalStack.AwsLocal.Extensions;
-using LocalStack.AwsLocal.ProcessCore;
-using LocalStack.AwsLocal.ProcessCore.IO;
-using LocalStack.Client.Contracts;
-using LocalStack.Client.Models;
-
-namespace LocalStack.AwsLocal
+namespace LocalStack.AwsLocal;
+
+public class CommandDispatcher
 {
-    public class CommandDispatcher
-    {
-        private const string UsageResource = "LocalStack.AwsLocal.Docs.Usage.txt";
+    private const string UsageResource = "LocalStack.AwsLocal.Docs.Usage.txt";
 
-        private readonly IProcessRunner _processRunner;
-        private readonly IConfig _config;
-        private readonly IFileSystem _fileSystem;
-        private readonly string[] _args;
+    private readonly IProcessRunner _processRunner;
+    private readonly IConfig _config;
+    private readonly IFileSystem _fileSystem;
+    private readonly string[] _args;
 
-        public CommandDispatcher(IProcessRunner processRunner, IConfig config, IFileSystem fileSystem, string[] args)
+    public CommandDispatcher(IProcessRunner processRunner, IConfig config, IFileSystem fileSystem, string[] args)
+    {
+        _processRunner = processRunner;
+        _config = config;
+        _fileSystem = fileSystem;
+        _args = args;
+    }
+
+    public void Run()
+    {
+        if (_args.Length == 0 || (_args[0] == "-h"))
         {
-            _processRunner = processRunner;
-            _config = config;
-            _fileSystem = fileSystem;
-            _args = args;
+            string usageInfo = GetUsageInfo();
+            ConsoleContext.Current.WriteLine(usageInfo);
+            EnvironmentContext.Current.Exit(0);
+            return;
         }
 
-        public void Run()
-        {
-            if (_args.Length == 0 || (_args[0] == "-h"))
-            {
-                string usageInfo = GetUsageInfo();
-                ConsoleContext.Current.WriteLine(usageInfo);
-                EnvironmentContext.Current.Exit(0);
-                return;
-            }
+        string serviceName = _args.ExtractServiceName();
 
-            string serviceName = _args.ExtractServiceName();
+        if (string.IsNullOrEmpty(serviceName))
+        {
+            ConsoleContext.Current.WriteLine("ERROR: Invalid argument, please enter a valid aws cli command");
+            EnvironmentContext.Current.Exit(1);
+            return;
+        }
 
-            if (string.IsNullOrEmpty(serviceName))
-            {
-                ConsoleContext.Current.WriteLine("ERROR: Invalid argument, please enter a valid aws cli command");
-                EnvironmentContext.Current.Exit(1);
-                return;
-            }
+        AwsServiceEndpoint awsServiceEndpoint = _config.GetServiceEndpoint(serviceName);
 
-            AwsServiceEndpoint? awsServiceEndpoint = _config.GetServiceEndpoint(serviceName);
+        if (awsServiceEndpoint == null)
+        {
+            ConsoleContext.Current.WriteLine($"ERROR: Unable to find LocalStack endpoint for service {serviceName}");
+            EnvironmentContext.Current.Exit(1);
+            return;
+        }
 
-            if (awsServiceEndpoint == null)
-            {
-                ConsoleContext.Current.WriteLine($"ERROR: Unable to find LocalStack endpoint for service {serviceName}");
-                EnvironmentContext.Current.Exit(1);
-                return;
-            }
+        var processSettings = new ProcessSettings { NoWorkingDirectory = true, Silent = true, EnvironmentVariables = new Dictionary<string, string>() };
 
-            var processSettings = new ProcessSettings
-            { NoWorkingDirectory = true, Silent = true, EnvironmentVariables = new Dictionary<string, string>() };
+        string defaultRegion = Environment.GetEnvironmentVariable("DEFAULT_REGION");
 
-            string? defaultRegion = Environment.GetEnvironmentVariable("DEFAULT_REGION");
+        if (!string.IsNullOrEmpty(defaultRegion))
+        {
+            ConsoleContext.Current.WriteLine("Environment variable \"AWS_DEFAULT_REGION\" will be overwritten by \"DEFAULT_REGION\"");
 
-            if (!string.IsNullOrEmpty(defaultRegion))
-            {
-                ConsoleContext.Current.WriteLine("Environment variable \"AWS_DEFAULT_REGION\" will be overwritten by \"DEFAULT_REGION\"");
+            Environment.SetEnvironmentVariable("AWS_DEFAULT_REGION", defaultRegion);
+        }
 
-                Environment.SetEnvironmentVariable("AWS_DEFAULT_REGION", defaultRegion);
-            }
+        processSettings.EnvironmentVariables.Add("AWS_DEFAULT_REGION", Environment.GetEnvironmentVariable("AWS_DEFAULT_REGION") ?? "us-east-1");
+        processSettings.EnvironmentVariables.Add("AWS_ACCESS_KEY_ID", Environment.GetEnvironmentVariable("AWS_ACCESS_KEY_ID") ?? "_not_needed_locally_");
+        processSettings.EnvironmentVariables.Add("AWS_SECRET_ACCESS_KEY", Environment.GetEnvironmentVariable("AWS_SECRET_ACCESS_KEY") ?? "_not_needed_locally_");
 
-            processSettings.EnvironmentVariables.Add("AWS_DEFAULT_REGION", Environment.GetEnvironmentVariable("AWS_DEFAULT_REGION") ?? "us-east-1");
-            processSettings.EnvironmentVariables.Add("AWS_ACCESS_KEY_ID", Environment.GetEnvironmentVariable("AWS_ACCESS_KEY_ID") ?? "_not_needed_locally_");
-            processSettings.EnvironmentVariables.Add("AWS_SECRET_ACCESS_KEY", Environment.GetEnvironmentVariable("AWS_SECRET_ACCESS_KEY") ?? "_not_needed_locally_");
 
+        var builder = new ProcessArgumentBuilder();
+        builder.Append(_args[0]);
+        builder.AppendSwitch("--endpoint-url", "=", awsServiceEndpoint.ServiceUrl);
 
-            var builder = new ProcessArgumentBuilder();
-            builder.Append(_args[0]);
-            builder.AppendSwitch("--endpoint-url", "=", awsServiceEndpoint.ServiceUrl);
+        if (awsServiceEndpoint.ServiceUrl.StartsWith("https"))
+        {
+            builder.Append("--no-verify-ssl");
+        }
 
-            if (awsServiceEndpoint.ServiceUrl.StartsWith("https"))
+        var passToNextArgument = false;
+        for (var i = 0; i < _args.Length; i++)
+        {
+            string argument = _args[i];
+                
+            if (argument == _args[0])
             {
-                builder.Append("--no-verify-ssl");
+                continue;
             }
 
-            var passToNextArgument = false;
-            for (var i = 0; i < _args.Length; i++)
+            if (passToNextArgument)
             {
-                string argument = _args[i];
-                
-                if (argument == _args[0])
-                {
-                    continue;
-                }
+                passToNextArgument = false;
+                continue;
+            }
 
-                if (passToNextArgument)
-                {
-                    passToNextArgument = false;
-                    continue;
-                }
 
+            if (argument.StartsWith("--") && !argument.Contains("=") && i + 1 < _args.Length) // switch argument
+            {
+                string nextArgument = _args[i + 1];
+                builder.AppendSwitchQuoted(argument, " ", nextArgument);
 
-                if (argument.StartsWith("--") && !argument.Contains("=") && i + 1 < _args.Length) // switch argument
-                {
-                    string nextArgument = _args[i + 1];
-                    builder.AppendSwitchQuoted(argument, " ", nextArgument);
+                passToNextArgument = true;
+                continue;
+            }
 
-                    passToNextArgument = true;
-                    continue;
-                }
+            builder.Append(argument);
+        }
 
-                builder.Append(argument);
-            }
 
+        processSettings.Arguments = builder;
 
-            processSettings.Arguments = builder;
+        string[] awsExec = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+            ? new[] {"aws.exe", "aws.cmd"}
+            : new[] {"aws"};
 
-            string[] awsExec = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                ? new[] {"aws.exe", "aws.cmd"}
-                : new[] {"aws"};
+        FilePath awsPath = GetAwsPath(awsExec);
 
-            FilePath? awsPath = GetAwsPath(awsExec);
+        if (awsPath == null)
+        {
+            ConsoleContext.Current.WriteLine($"ERROR: Unable to find aws cli. Executable name: {string.Join(',', awsExec)}");
+            EnvironmentContext.Current.Exit(1);
+            return;
+        }
 
-            if (awsPath == null)
-            {
-                ConsoleContext.Current.WriteLine(
-                    $"ERROR: Unable to find aws cli. Executable name: {string.Join(',', awsExec)}");
-                EnvironmentContext.Current.Exit(1);
-                return;
-            }
+        IProcess process = _processRunner.Start(awsPath, processSettings);
 
-            IProcess? process = _processRunner.Start(awsPath, processSettings);
+        process?.WaitForExit();
+    }
 
-            process?.WaitForExit();
-        }
+    private static string GetUsageInfo()
+    {
+        using Stream stream = Assembly.GetCallingAssembly().GetManifestResourceStream(UsageResource);
+        using var reader = new StreamReader(stream ?? throw new NullReferenceException(nameof(stream)));
+        string result = reader.ReadToEnd();
 
-        private static string GetUsageInfo()
-        {
-            using Stream? stream = Assembly.GetCallingAssembly().GetManifestResourceStream(UsageResource);
-                using var reader = new StreamReader(stream ?? throw new NullReferenceException(nameof(stream)));
-                    string result = reader.ReadToEnd();
+        return result;
+    }
 
-            return result;
-        }
+    private FilePath GetAwsPath(params string[] awsPaths)
+    {
+        string[] pathDirs = null;
 
-        private FilePath? GetAwsPath(params string[] awsPaths)
+        // Look for each possible executable name in various places.
+        foreach (string toolExeName in awsPaths)
         {
-            string[]? pathDirs = null;
 
-            // Look for each possible executable name in various places.
-            foreach (string toolExeName in awsPaths)
+            // Cache the PATH directory list if we didn't already.
+            if (pathDirs == null)
             {
-
-                // Cache the PATH directory list if we didn't already.
-                if (pathDirs == null)
+                string pathEnv = Environment.GetEnvironmentVariable("PATH");
+                if (!string.IsNullOrEmpty(pathEnv))
                 {
-                    string? pathEnv = Environment.GetEnvironmentVariable("PATH");
-                    if (!string.IsNullOrEmpty(pathEnv))
-                    {
-                        pathDirs = pathEnv.Split(new[] { !RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ':' : ';' },
-                            StringSplitOptions.RemoveEmptyEntries);
-                    }
-                    else
-                    {
-                        pathDirs = new string[] { };
-                    }
+                    pathDirs = pathEnv.Split(new[] { !RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ':' : ';' },
+                        StringSplitOptions.RemoveEmptyEntries);
                 }
-
-                // Look in every PATH directory for the file.
-                foreach (var pathDir in pathDirs)
+                else
                 {
-                    FilePath file = new DirectoryPath(pathDir).CombineWithFilePath(toolExeName);
-                    if (_fileSystem.Exist(file))
-                    {
-                        return file.FullPath;
-                    }
+                    pathDirs = Array.Empty<string>();
                 }
             }
 
-            return null;
+            // Look in every PATH directory for the file.
+            foreach (string pathDir in pathDirs)
+            {
+                FilePath file = new DirectoryPath(pathDir).CombineWithFilePath(toolExeName);
+                if (_fileSystem.Exist(file))
+                {
+                    return file.FullPath;
+                }
+            }
         }
+
+        return null;
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Contracts/IDirectory.cs b/src/LocalStack.AwsLocal/Contracts/IDirectory.cs
index a701380..fee17b4 100644
--- a/src/LocalStack.AwsLocal/Contracts/IDirectory.cs
+++ b/src/LocalStack.AwsLocal/Contracts/IDirectory.cs
@@ -7,51 +7,47 @@
 *
 ***************************************************************************************/
 
-using System.Collections.Generic;
-using LocalStack.AwsLocal.ProcessCore.IO;
+namespace LocalStack.AwsLocal.Contracts;
 
-namespace LocalStack.AwsLocal.Contracts
+/// Represents a directory.
+public interface IDirectory : IFileSystemInfo
 {
-    /// Represents a directory.
-    public interface IDirectory : IFileSystemInfo
-    {
-        /// <summary>
-        /// Gets the path to the directory.
-        /// </summary>
-        /// <value>The path.</value>
-        new DirectoryPath? Path { get; }
+    /// <summary>
+    /// Gets the path to the directory.
+    /// </summary>
+    /// <value>The path.</value>
+    new DirectoryPath Path { get; }
 
-        /// <summary>
-        /// Creates the directory.
-        /// </summary>
-        void Create();
+    /// <summary>
+    /// Creates the directory.
+    /// </summary>
+    void Create();
 
-        /// <summary>
-        /// Moves the directory to the specified destination path.
-        /// </summary>
-        /// <param name="destination">The destination path.</param>
-        void Move(DirectoryPath destination);
+    /// <summary>
+    /// Moves the directory to the specified destination path.
+    /// </summary>
+    /// <param name="destination">The destination path.</param>
+    void Move(DirectoryPath destination);
 
-        /// <summary>
-        /// Deletes the directory.
-        /// </summary>
-        /// <param name="recursive">Will perform a recursive delete if set to <c>true</c>.</param>
-        void Delete(bool recursive);
+    /// <summary>
+    /// Deletes the directory.
+    /// </summary>
+    /// <param name="recursive">Will perform a recursive delete if set to <c>true</c>.</param>
+    void Delete(bool recursive);
 
-        /// <summary>
-        /// Gets directories matching the specified filter and scope.
-        /// </summary>
-        /// <param name="filter">The filter.</param>
-        /// <param name="scope">The search scope.</param>
-        /// <returns>Directories matching the filter and scope.</returns>
-        IEnumerable<IDirectory> GetDirectories(string filter, SearchScope scope);
+    /// <summary>
+    /// Gets directories matching the specified filter and scope.
+    /// </summary>
+    /// <param name="filter">The filter.</param>
+    /// <param name="scope">The search scope.</param>
+    /// <returns>Directories matching the filter and scope.</returns>
+    IEnumerable<IDirectory> GetDirectories(string filter, SearchScope scope);
 
-        /// <summary>
-        /// Gets files matching the specified filter and scope.
-        /// </summary>
-        /// <param name="filter">The filter.</param>
-        /// <param name="scope">The search scope.</param>
-        /// <returns>Files matching the specified filter and scope.</returns>
-        IEnumerable<IFile> GetFiles(string filter, SearchScope scope);
-    }
+    /// <summary>
+    /// Gets files matching the specified filter and scope.
+    /// </summary>
+    /// <param name="filter">The filter.</param>
+    /// <param name="scope">The search scope.</param>
+    /// <returns>Files matching the specified filter and scope.</returns>
+    IEnumerable<IFile> GetFiles(string filter, SearchScope scope);
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Contracts/IFile.cs b/src/LocalStack.AwsLocal/Contracts/IFile.cs
index 1e33c44..50757d8 100644
--- a/src/LocalStack.AwsLocal/Contracts/IFile.cs
+++ b/src/LocalStack.AwsLocal/Contracts/IFile.cs
@@ -7,59 +7,55 @@
 *
 ***************************************************************************************/
 
-using System.IO;
-using LocalStack.AwsLocal.ProcessCore.IO;
+namespace LocalStack.AwsLocal.Contracts;
 
-namespace LocalStack.AwsLocal.Contracts
+/// <summary>
+/// Represents a file.
+/// </summary>
+public interface IFile : IFileSystemInfo
 {
     /// <summary>
-    /// Represents a file.
+    /// Gets the path to the file.
     /// </summary>
-    public interface IFile : IFileSystemInfo
-    {
-        /// <summary>
-        /// Gets the path to the file.
-        /// </summary>
-        /// <value>The path.</value>
-        new FilePath? Path { get; }
+    /// <value>The path.</value>
+    new FilePath Path { get; }
 
-        /// <summary>
-        /// Gets the length of the file.
-        /// </summary>
-        /// <value>The length of the file.</value>
-        long Length { get; }
+    /// <summary>
+    /// Gets the length of the file.
+    /// </summary>
+    /// <value>The length of the file.</value>
+    long Length { get; }
 
-        /// <summary>
-        /// Gets or sets the file attributes.
-        /// </summary>
-        /// <value>The file attributes.</value>
-        FileAttributes Attributes { get; set; }
+    /// <summary>
+    /// Gets or sets the file attributes.
+    /// </summary>
+    /// <value>The file attributes.</value>
+    FileAttributes Attributes { get; set; }
 
-        /// <summary>
-        /// Copies the file to the specified destination path.
-        /// </summary>
-        /// <param name="destination">The destination path.</param>
-        /// <param name="overwrite">Will overwrite existing destination file if set to <c>true</c>.</param>
-        void Copy(FilePath destination, bool overwrite);
+    /// <summary>
+    /// Copies the file to the specified destination path.
+    /// </summary>
+    /// <param name="destination">The destination path.</param>
+    /// <param name="overwrite">Will overwrite existing destination file if set to <c>true</c>.</param>
+    void Copy(FilePath destination, bool overwrite);
 
-        /// <summary>
-        /// Moves the file to the specified destination path.
-        /// </summary>
-        /// <param name="destination">The destination path.</param>
-        void Move(FilePath destination);
+    /// <summary>
+    /// Moves the file to the specified destination path.
+    /// </summary>
+    /// <param name="destination">The destination path.</param>
+    void Move(FilePath destination);
 
-        /// <summary>
-        /// Deletes the file.
-        /// </summary>
-        void Delete();
+    /// <summary>
+    /// Deletes the file.
+    /// </summary>
+    void Delete();
 
-        /// <summary>
-        /// Opens the file using the specified options.
-        /// </summary>
-        /// <param name="fileMode">The file mode.</param>
-        /// <param name="fileAccess">The file access.</param>
-        /// <param name="fileShare">The file share.</param>
-        /// <returns>A <see cref="Stream"/> to the file.</returns>
-        Stream Open(FileMode fileMode, FileAccess fileAccess, FileShare fileShare);
-    }
+    /// <summary>
+    /// Opens the file using the specified options.
+    /// </summary>
+    /// <param name="fileMode">The file mode.</param>
+    /// <param name="fileAccess">The file access.</param>
+    /// <param name="fileShare">The file share.</param>
+    /// <returns>A <see cref="Stream"/> to the file.</returns>
+    Stream Open(FileMode fileMode, FileAccess fileAccess, FileShare fileShare);
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Contracts/IFileSystem.cs b/src/LocalStack.AwsLocal/Contracts/IFileSystem.cs
index 79c281d..7d8188b 100644
--- a/src/LocalStack.AwsLocal/Contracts/IFileSystem.cs
+++ b/src/LocalStack.AwsLocal/Contracts/IFileSystem.cs
@@ -7,27 +7,24 @@
 *
 ***************************************************************************************/
 
-using LocalStack.AwsLocal.ProcessCore.IO;
+namespace LocalStack.AwsLocal.Contracts;
 
-namespace LocalStack.AwsLocal.Contracts
+/// <summary>
+/// Represents a file system.
+/// </summary>
+public interface IFileSystem
 {
     /// <summary>
-    /// Represents a file system.
+    /// Gets a <see cref="IFile"/> instance representing the specified path.
     /// </summary>
-    public interface IFileSystem
-    {
-        /// <summary>
-        /// Gets a <see cref="IFile"/> instance representing the specified path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A <see cref="IFile"/> instance representing the specified path.</returns>
-        IFile GetFile(FilePath path);
+    /// <param name="path">The path.</param>
+    /// <returns>A <see cref="IFile"/> instance representing the specified path.</returns>
+    IFile GetFile(FilePath path);
 
-        /// <summary>
-        /// Gets a <see cref="IDirectory"/> instance representing the specified path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A <see cref="IDirectory"/> instance representing the specified path.</returns>
-        IDirectory GetDirectory(DirectoryPath path);
-    }
-}
+    /// <summary>
+    /// Gets a <see cref="IDirectory"/> instance representing the specified path.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>A <see cref="IDirectory"/> instance representing the specified path.</returns>
+    IDirectory GetDirectory(DirectoryPath path);
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Contracts/IFileSystemInfo.cs b/src/LocalStack.AwsLocal/Contracts/IFileSystemInfo.cs
index 23f5591..2003ef7 100644
--- a/src/LocalStack.AwsLocal/Contracts/IFileSystemInfo.cs
+++ b/src/LocalStack.AwsLocal/Contracts/IFileSystemInfo.cs
@@ -7,35 +7,34 @@
 *
 ***************************************************************************************/
 
-using LocalStack.AwsLocal.ProcessCore.IO;
+using Path = LocalStack.AwsLocal.ProcessCore.IO.Path;
 
-namespace LocalStack.AwsLocal.Contracts
+namespace LocalStack.AwsLocal.Contracts;
+
+/// <summary>
+/// Represents an entry in the file system
+/// </summary>
+public interface IFileSystemInfo
 {
     /// <summary>
-    /// Represents an entry in the file system
+    /// Gets the path to the entry.
     /// </summary>
-    public interface IFileSystemInfo
-    {
-        /// <summary>
-        /// Gets the path to the entry.
-        /// </summary>
-        /// <value>The path.</value>
-        Path? Path { get; }
+    /// <value>The path.</value>
+    Path Path { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="IFileSystemInfo"/> exists.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if the entry exists; otherwise, <c>false</c>.
-        /// </value>
-        bool Exists { get; }
+    /// <summary>
+    /// Gets a value indicating whether this <see cref="IFileSystemInfo"/> exists.
+    /// </summary>
+    /// <value>
+    ///   <c>true</c> if the entry exists; otherwise, <c>false</c>.
+    /// </value>
+    bool Exists { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="IFileSystemInfo"/> is hidden.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if the entry is hidden; otherwise, <c>false</c>.
-        /// </value>
-        bool Hidden { get; }
-    }
+    /// <summary>
+    /// Gets a value indicating whether this <see cref="IFileSystemInfo"/> is hidden.
+    /// </summary>
+    /// <value>
+    ///   <c>true</c> if the entry is hidden; otherwise, <c>false</c>.
+    /// </value>
+    bool Hidden { get; }
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Contracts/IProcess.cs b/src/LocalStack.AwsLocal/Contracts/IProcess.cs
index 8413959..12a0c3b 100644
--- a/src/LocalStack.AwsLocal/Contracts/IProcess.cs
+++ b/src/LocalStack.AwsLocal/Contracts/IProcess.cs
@@ -7,49 +7,45 @@
 *
 ***************************************************************************************/
 
-using System;
-using System.Collections.Generic;
+namespace LocalStack.AwsLocal.Contracts;
 
-namespace LocalStack.AwsLocal.Contracts
+/// <summary>
+/// Represents a process.
+/// </summary>
+public interface IProcess : IDisposable
 {
     /// <summary>
-    /// Represents a process.
+    /// Waits for the process to exit.
     /// </summary>
-    public interface IProcess : IDisposable
-    {
-        /// <summary>
-        /// Waits for the process to exit.
-        /// </summary>
-        void WaitForExit();
+    void WaitForExit();
 
-        /// <summary>
-        /// Waits for the process to exit with possible timeout for command.
-        /// </summary>
-        /// <param name="milliseconds">The amount of time, in milliseconds, to wait for the associated process to exit. The maximum is the largest possible value of a 32-bit integer, which represents infinity to the operating system.</param>
-        /// <returns>true if the associated process has exited; otherwise, false.</returns>
-        bool WaitForExit(int milliseconds);
+    /// <summary>
+    /// Waits for the process to exit with possible timeout for command.
+    /// </summary>
+    /// <param name="milliseconds">The amount of time, in milliseconds, to wait for the associated process to exit. The maximum is the largest possible value of a 32-bit integer, which represents infinity to the operating system.</param>
+    /// <returns>true if the associated process has exited; otherwise, false.</returns>
+    bool WaitForExit(int milliseconds);
 
-        /// <summary>
-        /// Gets the exit code of the process.
-        /// </summary>
-        /// <returns>The exit code of the process.</returns>
-        int GetExitCode();
+    /// <summary>
+    /// Gets the exit code of the process.
+    /// </summary>
+    /// <returns>The exit code of the process.</returns>
+    int GetExitCode();
 
-        /// <summary>
-        /// Get the standard error of process.
-        /// </summary>
-        /// <returns>Returns process error output if <see cref="ProcessSettings.RedirectStandardError">RedirectStandardError</see> is true</returns>
-        IEnumerable<string> GetStandardError();
+    /// <summary>
+    /// Get the standard error of process.
+    /// </summary>
+    /// <returns>Returns process error output if <see cref="ProcessSettings.RedirectStandardError">RedirectStandardError</see> is true</returns>
+    IEnumerable<string> GetStandardError();
 
-        /// <summary>
-        /// Get the standard output of process
-        /// </summary>
-        /// <returns>Returns process output if <see cref="ProcessSettings.RedirectStandardOutput">RedirectStandardOutput</see> is true</returns>
-        IEnumerable<string> GetStandardOutput();
+    /// <summary>
+    /// Get the standard output of process
+    /// </summary>
+    /// <returns>Returns process output if <see cref="ProcessSettings.RedirectStandardOutput">RedirectStandardOutput</see> is true</returns>
+    IEnumerable<string> GetStandardOutput();
 
-        /// <summary>
-        /// Immediately stops the associated process.
-        /// </summary>
-        void Kill();
-    }
-}
+    /// <summary>
+    /// Immediately stops the associated process.
+    /// </summary>
+    void Kill();
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Contracts/IProcessArgument.cs b/src/LocalStack.AwsLocal/Contracts/IProcessArgument.cs
index 4d9cc97..f1d296f 100644
--- a/src/LocalStack.AwsLocal/Contracts/IProcessArgument.cs
+++ b/src/LocalStack.AwsLocal/Contracts/IProcessArgument.cs
@@ -7,25 +7,24 @@
 *
 ***************************************************************************************/
 
-namespace LocalStack.AwsLocal.Contracts
+namespace LocalStack.AwsLocal.Contracts;
+
+/// <summary>
+///  Represents a process argument.
+/// </summary>
+public interface IProcessArgument
 {
     /// <summary>
-    ///  Represents a process argument.
+    /// Render the arguments as a <see cref="string"/>.
+    /// Sensitive information will be included.
     /// </summary>
-    public interface IProcessArgument
-    {
-        /// <summary>
-        /// Render the arguments as a <see cref="string"/>.
-        /// Sensitive information will be included.
-        /// </summary>
-        /// <returns>A string representation of the argument.</returns>
-        string Render();
+    /// <returns>A string representation of the argument.</returns>
+    string Render();
 
-        /// <summary>
-        /// Renders the argument as a <see cref="string"/>.
-        /// Sensitive information will be redacted.
-        /// </summary>
-        /// <returns>A safe string representation of the argument.</returns>
-        string RenderSafe();
-    }
-}
+    /// <summary>
+    /// Renders the argument as a <see cref="string"/>.
+    /// Sensitive information will be redacted.
+    /// </summary>
+    /// <returns>A safe string representation of the argument.</returns>
+    string RenderSafe();
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Contracts/IProcessRunner.cs b/src/LocalStack.AwsLocal/Contracts/IProcessRunner.cs
index e9534df..36d03b9 100644
--- a/src/LocalStack.AwsLocal/Contracts/IProcessRunner.cs
+++ b/src/LocalStack.AwsLocal/Contracts/IProcessRunner.cs
@@ -7,10 +7,6 @@
 *
 ***************************************************************************************/
 
-
-using LocalStack.AwsLocal.ProcessCore;
-using LocalStack.AwsLocal.ProcessCore.IO;
-
 namespace LocalStack.AwsLocal.Contracts
 {
     /// <summary>
@@ -24,6 +20,6 @@ public interface IProcessRunner
         /// <param name="filePath">The file name such as an application or document with which to start the process.</param>
         /// <param name="settings">The information about the process to start.</param>
         /// <returns>A process handle.</returns>
-        IProcess? Start(FilePath filePath, ProcessSettings settings);
+        IProcess Start(FilePath filePath, ProcessSettings settings);
     }
 }
diff --git a/src/LocalStack.AwsLocal/Extensions/ArgumentExtensions.cs b/src/LocalStack.AwsLocal/Extensions/ArgumentExtensions.cs
index 32e95c6..1a8c528 100644
--- a/src/LocalStack.AwsLocal/Extensions/ArgumentExtensions.cs
+++ b/src/LocalStack.AwsLocal/Extensions/ArgumentExtensions.cs
@@ -1,37 +1,33 @@
-using System.Collections.Generic;
-using System.Linq;
+namespace LocalStack.AwsLocal.Extensions;
 
-namespace LocalStack.AwsLocal.Extensions
+public static class ArgumentExtensions
 {
-    public static class ArgumentExtensions
+    public static string ExtractServiceName(this IEnumerable<string> args)
     {
-        public static string ExtractServiceName(this IEnumerable<string> args)
+        foreach (string arg in args)
         {
-            foreach (string arg in args)
+            if (arg.StartsWith('-'))
             {
-                if (arg.StartsWith('-'))
-                {
-                    continue;
-                }
-
-                return arg == "s3api" ? "s3" : arg;
+                continue;
             }
 
-            return string.Empty;
+            return arg == "s3api" ? "s3" : arg;
         }
 
-        public static string GetCliCommand(this IEnumerable<string> args, string serviceUrl)
-        {
-            var arguments = args.ToList();
-            arguments.Insert(0, "aws");
-            arguments.Insert(1, $"--endpoint-url={serviceUrl}");
+        return string.Empty;
+    }
 
-            if (serviceUrl.StartsWith("https"))
-            {
-                arguments.Insert(2, "--no-verify-ssl");
-            }
+    public static string GetCliCommand(this IEnumerable<string> args, string serviceUrl)
+    {
+        List<string> arguments = args.ToList();
+        arguments.Insert(0, "aws");
+        arguments.Insert(1, $"--endpoint-url={serviceUrl}");
 
-            return string.Join(' ', arguments);
+        if (serviceUrl.StartsWith("https"))
+        {
+            arguments.Insert(2, "--no-verify-ssl");
         }
+
+        return string.Join(' ', arguments);
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Extensions/ConfigExtensions.cs b/src/LocalStack.AwsLocal/Extensions/ConfigExtensions.cs
index 9c9e5f9..a9f125a 100644
--- a/src/LocalStack.AwsLocal/Extensions/ConfigExtensions.cs
+++ b/src/LocalStack.AwsLocal/Extensions/ConfigExtensions.cs
@@ -1,17 +1,11 @@
-using System.Collections.Generic;
-using System.Linq;
-using LocalStack.Client.Contracts;
-using LocalStack.Client.Models;
+namespace LocalStack.AwsLocal.Extensions;
 
-namespace LocalStack.AwsLocal.Extensions
+public static class ConfigExtensions
 {
-    public static class ConfigExtensions
+    public static AwsServiceEndpoint GetServiceEndpoint(this IConfig config, string serviceName)
     {
-        public static AwsServiceEndpoint? GetServiceEndpoint(this IConfig config, string serviceName)
-        {
-            IEnumerable<AwsServiceEndpoint>? awsServiceEndpoints = config.GetAwsServiceEndpoints();
+        IEnumerable<AwsServiceEndpoint> awsServiceEndpoints = config.GetAwsServiceEndpoints();
 
-            return awsServiceEndpoints.SingleOrDefault(endpoint => endpoint.CliName == serviceName);
-        }
+        return awsServiceEndpoints.SingleOrDefault(endpoint => endpoint.CliName == serviceName);
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Extensions/FileSystemExtensions.cs b/src/LocalStack.AwsLocal/Extensions/FileSystemExtensions.cs
index f49f33f..810034b 100644
--- a/src/LocalStack.AwsLocal/Extensions/FileSystemExtensions.cs
+++ b/src/LocalStack.AwsLocal/Extensions/FileSystemExtensions.cs
@@ -1,44 +1,41 @@
-using System;
-using LocalStack.AwsLocal.Contracts;
-using LocalStack.AwsLocal.ProcessCore.IO;
+namespace LocalStack.AwsLocal.Extensions;
 
-namespace LocalStack.AwsLocal.Extensions
+/// <summary>
+/// Contains extensions for <see cref="IFileSystem"/>.
+/// </summary>
+public static class FileSystemExtensions
 {
     /// <summary>
-    /// Contains extensions for <see cref="IFileSystem"/>.
+    /// Determines if a specified <see cref="FilePath"/> exist.
     /// </summary>
-    public static class FileSystemExtensions
+    /// <param name="fileSystem">The file system.</param>
+    /// <param name="path">The file system.</param>
+    /// <returns>Whether or not the specified file exist.</returns>
+    public static bool Exist(this IFileSystem fileSystem, FilePath path)
     {
-        /// <summary>
-        /// Determines if a specified <see cref="FilePath"/> exist.
-        /// </summary>
-        /// <param name="path">The file system.</param>
-        /// <param name="path">The path.</param>
-        /// <returns>Whether or not the specified file exist.</returns>
-        public static bool Exist(this IFileSystem fileSystem, FilePath path)
+        if (fileSystem == null)
         {
-            if (fileSystem == null)
-            {
-                throw new ArgumentNullException(nameof(fileSystem));
-            }
-            var file = fileSystem.GetFile(path);
-            return file != null && file.Exists;
+            throw new ArgumentNullException(nameof(fileSystem));
         }
+        IFile file = fileSystem.GetFile(path);
+        
+        return file is { Exists: true };
+    }
 
-        /// <summary>
-        /// Determines if a specified <see cref="DirectoryPath"/> exist.
-        /// </summary>
-        /// <param name="fileSystem">The file system.</param>
-        /// <param name="path">The path.</param>
-        /// <returns>Whether or not the specified directory exist.</returns>
-        public static bool Exist(this IFileSystem fileSystem, DirectoryPath path)
+    /// <summary>
+    /// Determines if a specified <see cref="DirectoryPath"/> exist.
+    /// </summary>
+    /// <param name="fileSystem">The file system.</param>
+    /// <param name="path">The path.</param>
+    /// <returns>Whether or not the specified directory exist.</returns>
+    public static bool Exist(this IFileSystem fileSystem, DirectoryPath path)
+    {
+        if (fileSystem == null)
         {
-            if (fileSystem == null)
-            {
-                throw new ArgumentNullException(nameof(fileSystem));
-            }
-            var directory = fileSystem.GetDirectory(path);
-            return directory != null && directory.Exists;
+            throw new ArgumentNullException(nameof(fileSystem));
         }
+        IDirectory directory = fileSystem.GetDirectory(path);
+        
+        return directory is { Exists: true };
     }
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Extensions/ProcessArgumentListExtensions.cs b/src/LocalStack.AwsLocal/Extensions/ProcessArgumentListExtensions.cs
index 9298c75..9bfbf91 100644
--- a/src/LocalStack.AwsLocal/Extensions/ProcessArgumentListExtensions.cs
+++ b/src/LocalStack.AwsLocal/Extensions/ProcessArgumentListExtensions.cs
@@ -7,704 +7,697 @@
 *
 ***************************************************************************************/
 
-using System;
-using System.Globalization;
-using LocalStack.AwsLocal.Contracts;
-using LocalStack.AwsLocal.ProcessCore;
-using LocalStack.AwsLocal.ProcessCore.Arguments;
+namespace LocalStack.AwsLocal.Extensions;
 
-namespace LocalStack.AwsLocal.Extensions
+public static class ProcessArgumentListExtensions
 {
- public static class ProcessArgumentListExtensions
-    {
-        /// <summary>
-        /// Appends the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="text">The text to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? Append(this ProcessArgumentBuilder builder, string text)
-        {
-            builder?.Append(new TextArgument(text));
-            return builder;
-        }
+    /// <summary>
+    /// Appends the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="text">The text to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder Append(this ProcessArgumentBuilder builder, string text)
+    {
+        builder?.Append(new TextArgument(text));
+        return builder;
+    }
 
-        /// <summary>
-        /// Prepend the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="text">The text to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? Prepend(this ProcessArgumentBuilder builder, string text)
-        {
-            builder?.Prepend(new TextArgument(text));
-            return builder;
-        }
+    /// <summary>
+    /// Prepend the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="text">The text to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder Prepend(this ProcessArgumentBuilder builder, string text)
+    {
+        builder?.Prepend(new TextArgument(text));
+        return builder;
+    }
 
-        /// <summary>
-        /// Formats and appends the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="format">A composite format string.</param>
-        /// <param name="args">An object array that contains zero or more objects to format.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
-        /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
-        public static ProcessArgumentBuilder? Append(this ProcessArgumentBuilder builder, string format, params object[] args)
-        {
-            var text = string.Format(CultureInfo.InvariantCulture, format, args);
-            return Append(builder, text);
-        }
+    /// <summary>
+    /// Formats and appends the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="format">A composite format string.</param>
+    /// <param name="args">An object array that contains zero or more objects to format.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
+    /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
+    public static ProcessArgumentBuilder Append(this ProcessArgumentBuilder builder, string format, params object[] args)
+    {
+        string text = string.Format(CultureInfo.InvariantCulture, format, args);
+        return Append(builder, text);
+    }
 
-        /// <summary>
-        /// Formats and prepends the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="format">A composite format string.</param>
-        /// <param name="args">An object array that contains zero or more objects to format.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
-        /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
-        public static ProcessArgumentBuilder? Prepend(this ProcessArgumentBuilder builder, string format, params object[] args)
-        {
-            var text = string.Format(CultureInfo.InvariantCulture, format, args);
-            return Prepend(builder, text);
-        }
+    /// <summary>
+    /// Formats and prepends the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="format">A composite format string.</param>
+    /// <param name="args">An object array that contains zero or more objects to format.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
+    /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
+    public static ProcessArgumentBuilder Prepend(this ProcessArgumentBuilder builder, string format, params object[] args)
+    {
+        string text = string.Format(CultureInfo.InvariantCulture, format, args);
+        return Prepend(builder, text);
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="text">The text to be quoted and appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendQuoted(this ProcessArgumentBuilder builder, string text)
-        {
-            builder?.Append(new QuotedArgument(new TextArgument(text)));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and appends the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="text">The text to be quoted and appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendQuoted(this ProcessArgumentBuilder builder, string text)
+    {
+        builder?.Append(new QuotedArgument(new TextArgument(text)));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and prepends the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="text">The text to be quoted and prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependQuoted(this ProcessArgumentBuilder builder, string text)
-        {
-            builder?.Prepend(new QuotedArgument(new TextArgument(text)));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and prepends the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="text">The text to be quoted and prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependQuoted(this ProcessArgumentBuilder builder, string text)
+    {
+        builder?.Prepend(new QuotedArgument(new TextArgument(text)));
+        return builder;
+    }
 
-        /// <summary>
-        /// Formats, quotes and appends the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="format">A composite format string to be quoted and appended.</param>
-        /// <param name="args">An object array that contains zero or more objects to format.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
-        /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
-        public static ProcessArgumentBuilder? AppendQuoted(this ProcessArgumentBuilder builder, string format, params object[] args)
-        {
-            var text = string.Format(CultureInfo.InvariantCulture, format, args);
-            return AppendQuoted(builder, text);
-        }
+    /// <summary>
+    /// Formats, quotes and appends the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="format">A composite format string to be quoted and appended.</param>
+    /// <param name="args">An object array that contains zero or more objects to format.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
+    /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
+    public static ProcessArgumentBuilder AppendQuoted(this ProcessArgumentBuilder builder, string format, params object[] args)
+    {
+        string text = string.Format(CultureInfo.InvariantCulture, format, args);
+        return AppendQuoted(builder, text);
+    }
 
-        /// <summary>
-        /// Formats, quotes and prepends the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="format">A composite format string to be quoted and prepended.</param>
-        /// <param name="args">An object array that contains zero or more objects to format.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
-        /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
-        public static ProcessArgumentBuilder? PrependQuoted(this ProcessArgumentBuilder builder, string format, params object[] args)
-        {
-            var text = string.Format(CultureInfo.InvariantCulture, format, args);
-            return PrependQuoted(builder, text);
-        }
+    /// <summary>
+    /// Formats, quotes and prepends the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="format">A composite format string to be quoted and prepended.</param>
+    /// <param name="args">An object array that contains zero or more objects to format.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
+    /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
+    public static ProcessArgumentBuilder PrependQuoted(this ProcessArgumentBuilder builder, string format, params object[] args)
+    {
+        string text = string.Format(CultureInfo.InvariantCulture, format, args);
+        return PrependQuoted(builder, text);
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified argument to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="argument">The argument to be quoted and appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendQuoted(this ProcessArgumentBuilder builder, IProcessArgument argument)
-        {
-            builder?.Append(new QuotedArgument(argument));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and appends the specified argument to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="argument">The argument to be quoted and appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendQuoted(this ProcessArgumentBuilder builder, IProcessArgument argument)
+    {
+        builder?.Append(new QuotedArgument(argument));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and prepends the specified argument to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="argument">The argument to be quoted and prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependQuoted(this ProcessArgumentBuilder builder, IProcessArgument argument)
-        {
-            builder?.Prepend(new QuotedArgument(argument));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and prepends the specified argument to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="argument">The argument to be quoted and prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependQuoted(this ProcessArgumentBuilder builder, IProcessArgument argument)
+    {
+        builder?.Prepend(new QuotedArgument(argument));
+        return builder;
+    }
 
-        /// <summary>
-        /// Appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="text">The secret text to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSecret(this ProcessArgumentBuilder builder, string text)
-        {
-            builder?.Append(new SecretArgument(new TextArgument(text)));
-            return builder;
-        }
+    /// <summary>
+    /// Appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="text">The secret text to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSecret(this ProcessArgumentBuilder builder, string text)
+    {
+        builder?.Append(new SecretArgument(new TextArgument(text)));
+        return builder;
+    }
 
-        /// <summary>
-        /// Prepends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="text">The secret text to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSecret(this ProcessArgumentBuilder builder, string text)
-        {
-            builder?.Prepend(new SecretArgument(new TextArgument(text)));
-            return builder;
-        }
+    /// <summary>
+    /// Prepends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="text">The secret text to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSecret(this ProcessArgumentBuilder builder, string text)
+    {
+        builder?.Prepend(new SecretArgument(new TextArgument(text)));
+        return builder;
+    }
 
-        /// <summary>
-        /// Formats and appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="format">A composite format string for the secret text to be appended.</param>
-        /// <param name="args">An object array that contains zero or more objects to format.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
-        /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSecret(this ProcessArgumentBuilder builder, string format, params object[] args)
-        {
-            var text = string.Format(CultureInfo.InvariantCulture, format, args);
-            return AppendSecret(builder, text);
-        }
+    /// <summary>
+    /// Formats and appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="format">A composite format string for the secret text to be appended.</param>
+    /// <param name="args">An object array that contains zero or more objects to format.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
+    /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSecret(this ProcessArgumentBuilder builder, string format, params object[] args)
+    {
+        string text = string.Format(CultureInfo.InvariantCulture, format, args);
+        return AppendSecret(builder, text);
+    }
 
-        /// <summary>
-        /// Formats and prepend the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="format">A composite format string for the secret text to be prepended.</param>
-        /// <param name="args">An object array that contains zero or more objects to format.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
-        /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSecret(this ProcessArgumentBuilder builder, string format, params object[] args)
-        {
-            var text = string.Format(CultureInfo.InvariantCulture, format, args);
-            return PrependSecret(builder, text);
-        }
+    /// <summary>
+    /// Formats and prepend the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="format">A composite format string for the secret text to be prepended.</param>
+    /// <param name="args">An object array that contains zero or more objects to format.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
+    /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSecret(this ProcessArgumentBuilder builder, string format, params object[] args)
+    {
+        string text = string.Format(CultureInfo.InvariantCulture, format, args);
+        return PrependSecret(builder, text);
+    }
 
-        /// <summary>
-        /// Appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="argument">The secret argument to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSecret(this ProcessArgumentBuilder builder, IProcessArgument argument)
-        {
-            builder?.Append(new SecretArgument(argument));
-            return builder;
-        }
+    /// <summary>
+    /// Appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="argument">The secret argument to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSecret(this ProcessArgumentBuilder builder, IProcessArgument argument)
+    {
+        builder?.Append(new SecretArgument(argument));
+        return builder;
+    }
 
-        /// <summary>
-        /// Prepend the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="argument">The secret argument to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSecret(this ProcessArgumentBuilder builder, IProcessArgument argument)
-        {
-            builder?.Prepend(new SecretArgument(argument));
-            return builder;
-        }
+    /// <summary>
+    /// Prepend the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="argument">The secret argument to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSecret(this ProcessArgumentBuilder builder, IProcessArgument argument)
+    {
+        builder?.Prepend(new SecretArgument(argument));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="text">The secret text to be quoted and appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendQuotedSecret(this ProcessArgumentBuilder builder, string text)
-        {
-            builder?.AppendQuoted(new SecretArgument(new TextArgument(text)));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="text">The secret text to be quoted and appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendQuotedSecret(this ProcessArgumentBuilder builder, string text)
+    {
+        builder?.AppendQuoted(new SecretArgument(new TextArgument(text)));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and prepends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="text">The secret text to be quoted and prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependQuotedSecret(this ProcessArgumentBuilder builder, string text)
-        {
-            builder?.PrependQuoted(new SecretArgument(new TextArgument(text)));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and prepends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="text">The secret text to be quoted and prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependQuotedSecret(this ProcessArgumentBuilder builder, string text)
+    {
+        builder?.PrependQuoted(new SecretArgument(new TextArgument(text)));
+        return builder;
+    }
 
-        /// <summary>
-        /// Formats, quotes and appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="format">A composite format string for the secret text to be quoted and appended.</param>
-        /// <param name="args">An object array that contains zero or more objects to format.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
-        /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendQuotedSecret(this ProcessArgumentBuilder builder, string format, params object[] args)
-        {
-            var text = string.Format(CultureInfo.InvariantCulture, format, args);
-            return AppendQuotedSecret(builder, text);
-        }
+    /// <summary>
+    /// Formats, quotes and appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="format">A composite format string for the secret text to be quoted and appended.</param>
+    /// <param name="args">An object array that contains zero or more objects to format.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
+    /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendQuotedSecret(this ProcessArgumentBuilder builder, string format, params object[] args)
+    {
+        string text = string.Format(CultureInfo.InvariantCulture, format, args);
+        return AppendQuotedSecret(builder, text);
+    }
 
-        /// <summary>
-        /// Formats, quotes and prepends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="format">A composite format string for the secret text to be quoted and prepended.</param>
-        /// <param name="args">An object array that contains zero or more objects to format.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
-        /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependQuotedSecret(this ProcessArgumentBuilder builder, string format, params object[] args)
-        {
-            var text = string.Format(CultureInfo.InvariantCulture, format, args);
-            return PrependQuotedSecret(builder, text);
-        }
+    /// <summary>
+    /// Formats, quotes and prepends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="format">A composite format string for the secret text to be quoted and prepended.</param>
+    /// <param name="args">An object array that contains zero or more objects to format.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    /// <exception cref="ArgumentNullException"><paramref name="format" /> or <paramref name="args" /> is null. </exception>
+    /// <exception cref="FormatException"><paramref name="format" /> is invalid.-or- The index of a format item is less than zero, or greater than or equal to the length of the <paramref name="args" /> array. </exception>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependQuotedSecret(this ProcessArgumentBuilder builder, string format, params object[] args)
+    {
+        string text = string.Format(CultureInfo.InvariantCulture, format, args);
+        return PrependQuotedSecret(builder, text);
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="argument">The secret argument to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendQuotedSecret(this ProcessArgumentBuilder builder, IProcessArgument argument)
-        {
-            builder?.AppendQuoted(new SecretArgument(argument));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="argument">The secret argument to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendQuotedSecret(this ProcessArgumentBuilder builder, IProcessArgument argument)
+    {
+        builder?.AppendQuoted(new SecretArgument(argument));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and prepends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="argument">The secret argument to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependQuotedSecret(this ProcessArgumentBuilder builder, IProcessArgument argument)
-        {
-            builder?.PrependQuoted(new SecretArgument(argument));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and prepends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="argument">The secret argument to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependQuotedSecret(this ProcessArgumentBuilder builder, IProcessArgument argument)
+    {
+        builder?.PrependQuoted(new SecretArgument(argument));
+        return builder;
+    }
 
-        /// <summary>
-        /// Appends the specified switch to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="text">The text to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitch(this ProcessArgumentBuilder builder, string @switch, string text)
-        {
-            return AppendSwitch(builder, @switch, " ", text);
-        }
+    /// <summary>
+    /// Appends the specified switch to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="text">The text to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitch(this ProcessArgumentBuilder builder, string @switch, string text)
+    {
+        return AppendSwitch(builder, @switch, " ", text);
+    }
 
-        /// <summary>
-        /// Prepend the specified switch to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="text">The text to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitch(this ProcessArgumentBuilder builder, string @switch, string text)
-        {
-            return PrependSwitch(builder, @switch, " ", text);
-        }
+    /// <summary>
+    /// Prepend the specified switch to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="text">The text to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitch(this ProcessArgumentBuilder builder, string @switch, string text)
+    {
+        return PrependSwitch(builder, @switch, " ", text);
+    }
 
-        /// <summary>
-        /// Appends the specified switch to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument.</param>
-        /// <param name="text">The text to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitch(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
-        {
-            builder?.Append(new SwitchArgument(@switch, new TextArgument(text), separator));
-            return builder;
-        }
+    /// <summary>
+    /// Appends the specified switch to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument.</param>
+    /// <param name="text">The text to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitch(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
+    {
+        builder?.Append(new SwitchArgument(@switch, new TextArgument(text), separator));
+        return builder;
+    }
 
-        /// <summary>
-        /// Prepend the specified switch to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument.</param>
-        /// <param name="text">The text to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitch(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
-        {
-            builder?.Prepend(new SwitchArgument(@switch, new TextArgument(text), separator));
-            return builder;
-        }
+    /// <summary>
+    /// Prepend the specified switch to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument.</param>
+    /// <param name="text">The text to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitch(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
+    {
+        builder?.Prepend(new SwitchArgument(@switch, new TextArgument(text), separator));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="text">The text to be quoted and appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string text)
-        {
-            return AppendSwitchQuoted(builder, @switch, " ", text);
-        }
+    /// <summary>
+    /// Quotes and appends the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="text">The text to be quoted and appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string text)
+    {
+        return AppendSwitchQuoted(builder, @switch, " ", text);
+    }
 
-        /// <summary>
-        /// Quotes and prepends the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="text">The text to be quoted and prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string text)
-        {
-            return PrependSwitchQuoted(builder, @switch, " ", text);
-        }
+    /// <summary>
+    /// Quotes and prepends the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="text">The text to be quoted and prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string text)
+    {
+        return PrependSwitchQuoted(builder, @switch, " ", text);
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument.</param>
-        /// <param name="text">The text to be quoted and appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
-        {
-            builder?.Append(new SwitchArgument(@switch, new QuotedArgument(new TextArgument(text)), separator));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and appends the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument.</param>
+    /// <param name="text">The text to be quoted and appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
+    {
+        builder?.Append(new SwitchArgument(@switch, new QuotedArgument(new TextArgument(text)), separator));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and prepends the specified text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument.</param>
-        /// <param name="text">The text to be quoted and prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
-        {
-            builder?.Prepend(new SwitchArgument(@switch, new QuotedArgument(new TextArgument(text)), separator));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and prepends the specified text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument.</param>
+    /// <param name="text">The text to be quoted and prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
+    {
+        builder?.Prepend(new SwitchArgument(@switch, new QuotedArgument(new TextArgument(text)), separator));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified argument to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="argument">The argument to be quoted and appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
-        {
-            return AppendSwitchQuoted(builder, @switch, " ", argument);
-        }
+    /// <summary>
+    /// Quotes and appends the specified argument to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="argument">The argument to be quoted and appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
+    {
+        return AppendSwitchQuoted(builder, @switch, " ", argument);
+    }
 
-        /// <summary>
-        /// Quotes and prepends the specified argument to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="argument">The argument to be quoted and prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
-        {
-            return PrependSwitchQuoted(builder, @switch, " ", argument);
-        }
+    /// <summary>
+    /// Quotes and prepends the specified argument to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="argument">The argument to be quoted and prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
+    {
+        return PrependSwitchQuoted(builder, @switch, " ", argument);
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified argument to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument.</param>
-        /// <param name="argument">The argument to be quoted and appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
-        {
-            builder?.Append(new SwitchArgument(@switch, new QuotedArgument(argument), separator));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and appends the specified argument to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument.</param>
+    /// <param name="argument">The argument to be quoted and appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
+    {
+        builder?.Append(new SwitchArgument(@switch, new QuotedArgument(argument), separator));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and prepends the specified argument to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument.</param>
-        /// <param name="argument">The argument to be quoted and prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
-        {
-            builder?.Prepend(new SwitchArgument(@switch, new QuotedArgument(argument), separator));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and prepends the specified argument to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument.</param>
+    /// <param name="argument">The argument to be quoted and prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitchQuoted(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
+    {
+        builder?.Prepend(new SwitchArgument(@switch, new QuotedArgument(argument), separator));
+        return builder;
+    }
 
-        /// <summary>
-        /// Appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="text">The secret text to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string text)
-        {
-            return AppendSwitchSecret(builder, @switch, " ", text);
-        }
+    /// <summary>
+    /// Appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="text">The secret text to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string text)
+    {
+        return AppendSwitchSecret(builder, @switch, " ", text);
+    }
 
-        /// <summary>
-        /// Prepend the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="text">The secret text to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string text)
-        {
-            return PrependSwitchSecret(builder, @switch, " ", text);
-        }
+    /// <summary>
+    /// Prepend the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="text">The secret text to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string text)
+    {
+        return PrependSwitchSecret(builder, @switch, " ", text);
+    }
 
-        /// <summary>
-        /// Appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument</param>
-        /// <param name="text">The secret text to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
-        {
-            builder?.Append(new SwitchArgument(@switch, new SecretArgument(new TextArgument(text)), separator));
-            return builder;
-        }
+    /// <summary>
+    /// Appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument</param>
+    /// <param name="text">The secret text to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
+    {
+        builder?.Append(new SwitchArgument(@switch, new SecretArgument(new TextArgument(text)), separator));
+        return builder;
+    }
 
-        /// <summary>
-        /// Prepend the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument</param>
-        /// <param name="text">The secret text to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
-        {
-            builder?.Prepend(new SwitchArgument(@switch, new SecretArgument(new TextArgument(text)), separator));
-            return builder;
-        }
+    /// <summary>
+    /// Prepend the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument</param>
+    /// <param name="text">The secret text to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
+    {
+        builder?.Prepend(new SwitchArgument(@switch, new SecretArgument(new TextArgument(text)), separator));
+        return builder;
+    }
 
-        /// <summary>
-        /// Appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="argument">The secret argument to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitchSecret(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
-        {
-            return AppendSwitchSecret(builder, @switch, " ", argument);
-        }
+    /// <summary>
+    /// Appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="argument">The secret argument to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitchSecret(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
+    {
+        return AppendSwitchSecret(builder, @switch, " ", argument);
+    }
 
-        /// <summary>
-        /// Prepend the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="argument">The secret argument to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitchSecret(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
-        {
-            return PrependSwitchSecret(builder, @switch, " ", argument);
-        }
+    /// <summary>
+    /// Prepend the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="argument">The secret argument to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitchSecret(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
+    {
+        return PrependSwitchSecret(builder, @switch, " ", argument);
+    }
 
-        /// <summary>
-        /// Appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument</param>
-        /// <param name="argument">The secret argument to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
-        {
-            builder?.Append(new SwitchArgument(@switch, new SecretArgument(argument), separator));
-            return builder;
-        }
+    /// <summary>
+    /// Appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument</param>
+    /// <param name="argument">The secret argument to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
+    {
+        builder?.Append(new SwitchArgument(@switch, new SecretArgument(argument), separator));
+        return builder;
+    }
 
-        /// <summary>
-        /// Prepend the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument</param>
-        /// <param name="argument">The secret argument to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
-        {
-            builder?.Prepend(new SwitchArgument(@switch, new SecretArgument(argument), separator));
-            return builder;
-        }
+    /// <summary>
+    /// Prepend the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument</param>
+    /// <param name="argument">The secret argument to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitchSecret(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
+    {
+        builder?.Prepend(new SwitchArgument(@switch, new SecretArgument(argument), separator));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="text">The secret text to be quoted and appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitchQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string text)
-        {
-            return AppendSwitchQuotedSecret(builder, @switch, " ", text);
-        }
+    /// <summary>
+    /// Quotes and appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="text">The secret text to be quoted and appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitchQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string text)
+    {
+        return AppendSwitchQuotedSecret(builder, @switch, " ", text);
+    }
 
-        /// <summary>
-        /// Quotes and prepend the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="text">The secret text to be quoted and prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitchQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string text)
-        {
-            return PrependSwitchQuotedSecret(builder, @switch, " ", text);
-        }
+    /// <summary>
+    /// Quotes and prepend the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="text">The secret text to be quoted and prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitchQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string text)
+    {
+        return PrependSwitchQuotedSecret(builder, @switch, " ", text);
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument.</param>
-        /// <param name="text">The secret text to be quoted and appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendSwitchQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
-        {
-            builder?.AppendSwitchQuoted(@switch, separator, new SecretArgument(new TextArgument(text)));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument.</param>
+    /// <param name="text">The secret text to be quoted and appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendSwitchQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
+    {
+        builder?.AppendSwitchQuoted(@switch, separator, new SecretArgument(new TextArgument(text)));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and prepends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument.</param>
-        /// <param name="text">The secret text to be quoted and prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependSwitchQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
-        {
-            builder?.PrependSwitchQuoted(@switch, separator, new SecretArgument(new TextArgument(text)));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and prepends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument.</param>
+    /// <param name="text">The secret text to be quoted and prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependSwitchQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string separator, string text)
+    {
+        builder?.PrependSwitchQuoted(@switch, separator, new SecretArgument(new TextArgument(text)));
+        return builder;
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="argument">The secret argument to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendQuotedSecret(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
-        {
-            return AppendQuotedSecret(builder, @switch, " ", argument);
-        }
+    /// <summary>
+    /// Quotes and appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="argument">The secret argument to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendQuotedSecret(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
+    {
+        return AppendQuotedSecret(builder, @switch, " ", argument);
+    }
 
-        /// <summary>
-        /// Quotes and prepends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="argument">The secret argument to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependQuotedSecret(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
-        {
-            return PrependQuotedSecret(builder, @switch, " ", argument);
-        }
+    /// <summary>
+    /// Quotes and prepends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="argument">The secret argument to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependQuotedSecret(this ProcessArgumentBuilder builder, string @switch, IProcessArgument argument)
+    {
+        return PrependQuotedSecret(builder, @switch, " ", argument);
+    }
 
-        /// <summary>
-        /// Quotes and appends the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument</param>
-        /// <param name="argument">The secret argument to be appended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? AppendQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
-        {
-            builder?.AppendSwitchQuoted(@switch, separator, new SecretArgument(argument));
-            return builder;
-        }
+    /// <summary>
+    /// Quotes and appends the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument</param>
+    /// <param name="argument">The secret argument to be appended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder AppendQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
+    {
+        builder?.AppendSwitchQuoted(@switch, separator, new SecretArgument(argument));
+        return builder;
+    }
+
+    /// <summary>
+    /// Quotes and prepend the specified secret text to the argument builder.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="switch">The switch preceding the text.</param>
+    /// <param name="separator">The separator between the switch and argument</param>
+    /// <param name="argument">The secret argument to be prepended.</param>
+    /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
+    public static ProcessArgumentBuilder PrependQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
+    {
+        builder?.PrependSwitchQuoted(@switch, separator, new SecretArgument(argument));
+        return builder;
+    }
+
+    /// <summary>
+    /// Indicates whether a <see cref="ProcessArgumentBuilder"/> is null or renders empty.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <returns><c>true</c> if <paramref name="builder"/> refers to a null or empty <see cref="ProcessArgumentBuilder"/>;
+    /// <c>false</c> if the <paramref name="builder"/>refers to non null or empty <see cref="ProcessArgumentBuilder"/></returns>
+    public static bool IsNullOrEmpty(this ProcessArgumentBuilder builder)
+    {
+        return builder == null || builder.Count == 0 || string.IsNullOrEmpty(builder.Render());
+    }
 
-        /// <summary>
-        /// Quotes and prepend the specified secret text to the argument builder.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="switch">The switch preceding the text.</param>
-        /// <param name="separator">The separator between the switch and argument</param>
-        /// <param name="argument">The secret argument to be prepended.</param>
-        /// <returns>The same <see cref="ProcessArgumentBuilder"/> instance so that multiple calls can be chained.</returns>
-        public static ProcessArgumentBuilder? PrependQuotedSecret(this ProcessArgumentBuilder builder, string @switch, string separator, IProcessArgument argument)
+    /// <summary>
+    /// Copies all the arguments of the source <see cref="ProcessArgumentBuilder"/> to target <see cref="ProcessArgumentBuilder"/>.
+    /// </summary>
+    /// <param name="source">The argument builder to copy from..</param>
+    /// <param name="target">The argument builder to copy to.</param>
+    public static void CopyTo(this ProcessArgumentBuilder source, ProcessArgumentBuilder target)
+    {
+        if (source == null)
         {
-            builder?.PrependSwitchQuoted(@switch, separator, new SecretArgument(argument));
-            return builder;
+            throw new ArgumentNullException(nameof(source));
         }
 
-        /// <summary>
-        /// Indicates whether a <see cref="ProcessArgumentBuilder"/> is null or renders empty.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <returns><c>true</c> if <paramref name="builder"/> refers to a null or empty <see cref="ProcessArgumentBuilder"/>;
-        /// <c>false</c> if the <paramref name="builder"/>refers to non null or empty <see cref="ProcessArgumentBuilder"/></returns>
-        public static bool IsNullOrEmpty(this ProcessArgumentBuilder builder)
+        if (target == null)
         {
-            return builder == null || builder.Count == 0 || string.IsNullOrEmpty(builder.Render());
+            throw new ArgumentNullException(nameof(target));
         }
 
-        /// <summary>
-        /// Copies all the arguments of the source <see cref="ProcessArgumentBuilder"/> to target <see cref="ProcessArgumentBuilder"/>.
-        /// </summary>
-        /// <param name="source">The argument builder to copy from..</param>
-        /// <param name="target">The argument builder to copy to.</param>
-        public static void CopyTo(this ProcessArgumentBuilder source, ProcessArgumentBuilder target)
+        foreach (IProcessArgument token in source)
         {
-            if (source == null)
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
-
-            if (target == null)
-            {
-                throw new ArgumentNullException(nameof(target));
-            }
-
-            foreach (var token in source)
-            {
-                target.Append(token);
-            }
+            target.Append(token);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Extensions/StringExtensions.cs b/src/LocalStack.AwsLocal/Extensions/StringExtensions.cs
index fdbf87a..4f909cc 100644
--- a/src/LocalStack.AwsLocal/Extensions/StringExtensions.cs
+++ b/src/LocalStack.AwsLocal/Extensions/StringExtensions.cs
@@ -7,74 +7,72 @@
 *
 ***************************************************************************************/
 
-using System;
+namespace LocalStack.AwsLocal.Extensions;
 
-namespace LocalStack.AwsLocal.Extensions
+/// <summary>
+/// Contains extension methods for <see cref="System.String"/>.
+/// </summary>
+public static class StringExtensions
 {
     /// <summary>
-    /// Contains extension methods for <see cref="System.String"/>.
+    /// Quotes the specified <see cref="System.String"/>.
     /// </summary>
-    public static class StringExtensions
+    /// <param name="value">The string to quote.</param>
+    /// <returns>A quoted string.</returns>
+    public static string Quote(this string value)
     {
-        /// <summary>
-        /// Quotes the specified <see cref="System.String"/>.
-        /// </summary>
-        /// <param name="value">The string to quote.</param>
-        /// <returns>A quoted string.</returns>
-        public static string Quote(this string value)
+        if (!IsQuoted(value))
         {
-            if (!IsQuoted(value))
-            {
-                value = string.Concat("\"", value, "\"");
-            }
-            return value;
+            value = string.Concat("\"", value, "\"");
         }
+        return value;
+    }
 
-        /// <summary>
-        /// Unquote the specified <see cref="System.String"/>.
-        /// </summary>
-        /// <param name="value">The string to unquote.</param>
-        /// <returns>An unquoted string.</returns>
-        public static string UnQuote(this string value)
+    /// <summary>
+    /// Unquote the specified <see cref="System.String"/>.
+    /// </summary>
+    /// <param name="value">The string to unquote.</param>
+    /// <returns>An unquoted string.</returns>
+    public static string UnQuote(this string value)
+    {
+        if (IsQuoted(value))
         {
-            if (IsQuoted(value))
-            {
-                value = value.Trim('"');
-            }
-            return value;
+            value = value.Trim('"');
         }
+        return value;
+    }
 
-        /// <summary>
-        /// Splits the <see cref="String"/> into lines.
-        /// </summary>
-        /// <param name="content">The string to split.</param>
-        /// <returns>The lines making up the provided string.</returns>
-        public static string[] SplitLines(this string content)
-        {
-            content = NormalizeLineEndings(content);
-            return content.Split(new[] { "\r\n" }, StringSplitOptions.None);
-        }
+    /// <summary>
+    /// Splits the <see cref="String"/> into lines.
+    /// </summary>
+    /// <param name="content">The string to split.</param>
+    /// <returns>The lines making up the provided string.</returns>
+    public static string[] SplitLines(this string content)
+    {
+        content = NormalizeLineEndings(content);
+        return content.Split(new[] { "\r\n" }, StringSplitOptions.None);
+    }
 
-        /// <summary>
-        /// Normalizes the line endings in a <see cref="String"/>.
-        /// </summary>
-        /// <param name="value">The string to normalize line endings in.</param>
-        /// <returns>A <see cref="String"/> with normalized line endings.</returns>
-        public static string NormalizeLineEndings(this string value)
+    /// <summary>
+    /// Normalizes the line endings in a <see cref="String"/>.
+    /// </summary>
+    /// <param name="value">The string to normalize line endings in.</param>
+    /// <returns>A <see cref="String"/> with normalized line endings.</returns>
+    public static string NormalizeLineEndings(this string value)
+    {
+        if (value == null)
         {
-            if (value != null)
-            {
-                value = value.Replace("\r\n", "\n");
-                value = value.Replace("\r", string.Empty);
-                return value.Replace("\n", "\r\n");
-            }
             return string.Empty;
         }
 
-        private static bool IsQuoted(this string value)
-        {
-            return value.StartsWith("\"", StringComparison.OrdinalIgnoreCase)
-                   && value.EndsWith("\"", StringComparison.OrdinalIgnoreCase);
-        }
+        value = value.Replace("\r\n", "\n");
+        value = value.Replace("\r", string.Empty);
+        return value.Replace("\n", "\r\n");
+    }
+
+    private static bool IsQuoted(this string value)
+    {
+        return value.StartsWith("\"", StringComparison.OrdinalIgnoreCase)
+               && value.EndsWith("\"", StringComparison.OrdinalIgnoreCase);
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/GlobalUsings.cs b/src/LocalStack.AwsLocal/GlobalUsings.cs
new file mode 100644
index 0000000..b9ae5fd
--- /dev/null
+++ b/src/LocalStack.AwsLocal/GlobalUsings.cs
@@ -0,0 +1,38 @@
+global using System;
+global using System.Collections.Generic;
+global using LocalStack.AwsLocal.ProcessCore.IO;
+global using LocalStack.AwsLocal.ProcessCore;
+global using System.IO;
+global using System.Linq;
+global using LocalStack.Client.Contracts;
+global using LocalStack.Client.Models;
+global using LocalStack.AwsLocal.Contracts;
+global using System.Globalization;
+global using LocalStack.AwsLocal.ProcessCore.Arguments;
+global using LocalStack.AwsLocal.Extensions;
+global using System.Reflection;
+global using System.Runtime.InteropServices;
+global using LocalStack.AwsLocal.AmbientContexts;
+global using System.Collections.Concurrent;
+global using System.Diagnostics;
+global using System.Collections;
+global using System.Text;
+global using LocalStack.Client.Enums;
+global using System.Diagnostics.CodeAnalysis;
+global using LocalStack.Client.Options;
+global using LocalStack.Client;
+
+#if NETCOREAPP3_1
+namespace System.Runtime.CompilerServices
+{
+    using System.ComponentModel;
+    /// <summary>
+    /// Reserved to be used by the compiler for tracking metadata.
+    /// This class should not be used by developers in source code.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    internal static class IsExternalInit
+    {
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/Arguments/QuotedArgument.cs b/src/LocalStack.AwsLocal/ProcessCore/Arguments/QuotedArgument.cs
index 7b58d56..38304cd 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/Arguments/QuotedArgument.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/Arguments/QuotedArgument.cs
@@ -7,53 +7,50 @@
 *
 ***************************************************************************************/
 
-using LocalStack.AwsLocal.Contracts;
+namespace LocalStack.AwsLocal.ProcessCore.Arguments;
 
-namespace LocalStack.AwsLocal.ProcessCore.Arguments
+/// <summary>
+/// Represents a quoted argument.
+/// </summary>
+public sealed class QuotedArgument : IProcessArgument
 {
+    private readonly IProcessArgument _argument;
+
     /// <summary>
-    /// Represents a quoted argument.
+    /// Initializes a new instance of the <see cref="QuotedArgument"/> class.
     /// </summary>
-    public sealed class QuotedArgument : IProcessArgument
+    /// <param name="argument">The argument.</param>
+    public QuotedArgument(IProcessArgument argument)
     {
-        private readonly IProcessArgument _argument;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QuotedArgument"/> class.
-        /// </summary>
-        /// <param name="argument">The argument.</param>
-        public QuotedArgument(IProcessArgument argument)
-        {
-            _argument = argument;
-        }
+        _argument = argument;
+    }
 
-        /// <summary>
-        /// Render the arguments as a <see cref="System.String" />.
-        /// Sensitive information will be included.
-        /// </summary>
-        /// <returns>A string representation of the argument.</returns>
-        public string Render()
-        {
-            return string.Concat("\"", _argument.Render(), "\"");
-        }
+    /// <summary>
+    /// Render the arguments as a <see cref="System.String" />.
+    /// Sensitive information will be included.
+    /// </summary>
+    /// <returns>A string representation of the argument.</returns>
+    public string Render()
+    {
+        return string.Concat("\"", _argument.Render(), "\"");
+    }
 
-        /// <summary>
-        /// Renders the argument as a <see cref="System.String" />.
-        /// Sensitive information will be redacted.
-        /// </summary>
-        /// <returns>A safe string representation of the argument.</returns>
-        public string RenderSafe()
-        {
-            return string.Concat("\"", _argument.RenderSafe(), "\"");
-        }
+    /// <summary>
+    /// Renders the argument as a <see cref="System.String" />.
+    /// Sensitive information will be redacted.
+    /// </summary>
+    /// <returns>A safe string representation of the argument.</returns>
+    public string RenderSafe()
+    {
+        return string.Concat("\"", _argument.RenderSafe(), "\"");
+    }
 
-        /// <summary>
-        /// Returns a <see cref="System.String" /> that represents the current object.
-        /// </summary>
-        /// <returns>A string that represents the current object.</returns>
-        public override string ToString()
-        {
-            return RenderSafe();
-        }
+    /// <summary>
+    /// Returns a <see cref="System.String" /> that represents the current object.
+    /// </summary>
+    /// <returns>A string that represents the current object.</returns>
+    public override string ToString()
+    {
+        return RenderSafe();
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/Arguments/SecretArgument.cs b/src/LocalStack.AwsLocal/ProcessCore/Arguments/SecretArgument.cs
index 5cde693..d777be4 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/Arguments/SecretArgument.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/Arguments/SecretArgument.cs
@@ -7,50 +7,47 @@
 *
 ***************************************************************************************/
 
-using LocalStack.AwsLocal.Contracts;
+namespace LocalStack.AwsLocal.ProcessCore.Arguments;
 
-namespace LocalStack.AwsLocal.ProcessCore.Arguments
+public sealed class SecretArgument : IProcessArgument
 {
-    public sealed class SecretArgument : IProcessArgument
-    {
-        private readonly IProcessArgument _argument;
+    private readonly IProcessArgument _argument;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SecretArgument"/> class.
-        /// </summary>
-        /// <param name="argument">The argument.</param>
-        public SecretArgument(IProcessArgument argument)
-        {
-            _argument = argument;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SecretArgument"/> class.
+    /// </summary>
+    /// <param name="argument">The argument.</param>
+    public SecretArgument(IProcessArgument argument)
+    {
+        _argument = argument;
+    }
 
-        /// <summary>
-        /// Render the arguments as a <see cref="System.String" />.
-        /// The secret text will be included.
-        /// </summary>
-        /// <returns>A string representation of the argument.</returns>
-        public string Render()
-        {
-            return _argument.Render();
-        }
+    /// <summary>
+    /// Render the arguments as a <see cref="System.String" />.
+    /// The secret text will be included.
+    /// </summary>
+    /// <returns>A string representation of the argument.</returns>
+    public string Render()
+    {
+        return _argument.Render();
+    }
 
-        /// <summary>
-        /// Renders the argument as a <see cref="System.String" />.
-        ///  The secret text will be redacted.
-        /// </summary>
-        /// <returns>A safe string representation of the argument.</returns>
-        public string RenderSafe()
-        {
-            return "[REDACTED]";
-        }
+    /// <summary>
+    /// Renders the argument as a <see cref="System.String" />.
+    ///  The secret text will be redacted.
+    /// </summary>
+    /// <returns>A safe string representation of the argument.</returns>
+    public string RenderSafe()
+    {
+        return "[REDACTED]";
+    }
 
-        /// <summary>
-        /// Returns a <see cref="System.String" /> that represents the current object.
-        /// </summary>
-        /// <returns>A string that represents the current object.</returns>
-        public override string ToString()
-        {
-            return RenderSafe();
-        }
+    /// <summary>
+    /// Returns a <see cref="System.String" /> that represents the current object.
+    /// </summary>
+    /// <returns>A string that represents the current object.</returns>
+    public override string ToString()
+    {
+        return RenderSafe();
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/Arguments/SwitchArgument.cs b/src/LocalStack.AwsLocal/ProcessCore/Arguments/SwitchArgument.cs
index 0aea3bf..788f850 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/Arguments/SwitchArgument.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/Arguments/SwitchArgument.cs
@@ -7,63 +7,60 @@
 *
 ***************************************************************************************/
 
-using LocalStack.AwsLocal.Contracts;
+namespace LocalStack.AwsLocal.ProcessCore.Arguments;
 
-namespace LocalStack.AwsLocal.ProcessCore.Arguments
+/// <summary>
+/// Represents a argument preceded by a switch.
+/// </summary>
+public class SwitchArgument : IProcessArgument
 {
+    private readonly string _switch;
+    private readonly IProcessArgument _argument;
+    private readonly string _separator;
+
     /// <summary>
-    /// Represents a argument preceded by a switch.
+    /// Initializes a new instance of the <see cref="SwitchArgument"/> class.
     /// </summary>
-    public class SwitchArgument : IProcessArgument
+    /// <param name="switch">The switch.</param>
+    /// <param name="argument">The argument.</param>
+    /// <param name="separator">The separator between the <paramref name="switch"/> and the <paramref name="argument"/>.</param>
+    public SwitchArgument(string @switch, IProcessArgument argument, string separator = " ")
     {
-        private readonly string _switch;
-        private readonly IProcessArgument _argument;
-        private readonly string _separator;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SwitchArgument"/> class.
-        /// </summary>
-        /// <param name="switch">The switch.</param>
-        /// <param name="argument">The argument.</param>
-        /// <param name="separator">The separator between the <paramref name="switch"/> and the <paramref name="argument"/>.</param>
-        public SwitchArgument(string @switch, IProcessArgument argument, string separator = " ")
-        {
-            _switch = @switch;
-            _argument = argument;
-            _separator = separator;
-        }
+        _switch = @switch;
+        _argument = argument;
+        _separator = separator;
+    }
 
-        /// <summary>
-        /// Render the arguments as a <see cref="System.String" />.
-        /// Sensitive information will be included.
-        /// </summary>
-        /// <returns>
-        /// A string representation of the argument.
-        /// </returns>
-        public string Render()
-        {
-            return string.Concat(_switch, _separator, _argument.Render());
-        }
+    /// <summary>
+    /// Render the arguments as a <see cref="System.String" />.
+    /// Sensitive information will be included.
+    /// </summary>
+    /// <returns>
+    /// A string representation of the argument.
+    /// </returns>
+    public string Render()
+    {
+        return string.Concat(_switch, _separator, _argument.Render());
+    }
 
-        /// <summary>
-        /// Renders the argument as a <see cref="System.String" />.
-        ///  The secret text will be redacted.
-        /// </summary>
-        /// <returns>A safe string representation of the argument.</returns>
-        public string RenderSafe()
-        {
-            return string.Concat(_switch, _separator, _argument.RenderSafe());
-        }
+    /// <summary>
+    /// Renders the argument as a <see cref="System.String" />.
+    ///  The secret text will be redacted.
+    /// </summary>
+    /// <returns>A safe string representation of the argument.</returns>
+    public string RenderSafe()
+    {
+        return string.Concat(_switch, _separator, _argument.RenderSafe());
+    }
 
-        /// <summary>
-        /// Returns a string that represents the current object.
-        /// </summary>
-        /// <returns>
-        /// A string that represents the current object.
-        /// </returns>
-        public override string ToString()
-        {
-            return RenderSafe();
-        }
+    /// <summary>
+    /// Returns a string that represents the current object.
+    /// </summary>
+    /// <returns>
+    /// A string that represents the current object.
+    /// </returns>
+    public override string ToString()
+    {
+        return RenderSafe();
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/Arguments/TextArgument.cs b/src/LocalStack.AwsLocal/ProcessCore/Arguments/TextArgument.cs
index b6fcd22..fd5c148 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/Arguments/TextArgument.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/Arguments/TextArgument.cs
@@ -8,57 +8,54 @@
 ***************************************************************************************/
 
 
-using LocalStack.AwsLocal.Contracts;
+namespace LocalStack.AwsLocal.ProcessCore.Arguments;
 
-namespace LocalStack.AwsLocal.ProcessCore.Arguments
+/// <summary>
+/// Represents a text argument.
+/// </summary>
+public sealed class TextArgument : IProcessArgument
 {
+    private readonly string _text;
+
     /// <summary>
-    /// Represents a text argument.
+    /// Initializes a new instance of the <see cref="TextArgument"/> class.
     /// </summary>
-    public sealed class TextArgument : IProcessArgument
+    /// <param name="text">The text.</param>
+    public TextArgument(string text)
     {
-        private readonly string _text;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TextArgument"/> class.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        public TextArgument(string text)
-        {
-            _text = text;
-        }
+        _text = text;
+    }
 
-        /// <summary>
-        /// Render the arguments as a <see cref="System.String" />.
-        /// Sensitive information will be included.
-        /// </summary>
-        /// <returns>
-        /// A string representation of the argument.
-        /// </returns>
-        public string Render()
-        {
-            return _text ?? string.Empty;
-        }
+    /// <summary>
+    /// Render the arguments as a <see cref="System.String" />.
+    /// Sensitive information will be included.
+    /// </summary>
+    /// <returns>
+    /// A string representation of the argument.
+    /// </returns>
+    public string Render()
+    {
+        return _text ?? string.Empty;
+    }
 
-        /// <summary>
-        /// Renders the argument as a <see cref="System.String" />.
-        /// Sensitive information will be redacted.
-        /// </summary>
-        /// <returns>
-        /// A safe string representation of the argument.
-        /// </returns>
-        public string RenderSafe()
-        {
-            return Render();
-        }
+    /// <summary>
+    /// Renders the argument as a <see cref="System.String" />.
+    /// Sensitive information will be redacted.
+    /// </summary>
+    /// <returns>
+    /// A safe string representation of the argument.
+    /// </returns>
+    public string RenderSafe()
+    {
+        return Render();
+    }
 
-        /// <summary>
-        /// Returns a <see cref="System.String" /> that represents the current object.
-        /// </summary>
-        /// <returns>A string that represents the current object.</returns>
-        public override string ToString()
-        {
-            return RenderSafe();
-        }
+    /// <summary>
+    /// Returns a <see cref="System.String" /> that represents the current object.
+    /// </summary>
+    /// <returns>A string that represents the current object.</returns>
+    public override string ToString()
+    {
+        return RenderSafe();
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/IO/Directory.cs b/src/LocalStack.AwsLocal/ProcessCore/IO/Directory.cs
index 7405db9..b44933d 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/IO/Directory.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/IO/Directory.cs
@@ -7,65 +7,58 @@
 *
 ***************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using LocalStack.AwsLocal.Contracts;
+namespace LocalStack.AwsLocal.ProcessCore.IO;
 
-namespace LocalStack.AwsLocal.ProcessCore.IO
+internal sealed class Directory : IDirectory
 {
-    internal sealed class Directory : IDirectory
-    {
-        private readonly DirectoryInfo _directory;
+    private readonly DirectoryInfo _directory;
 
-        public DirectoryPath? Path { get; }
+    public DirectoryPath Path { get; }
 
-        Path? IFileSystemInfo.Path => Path;
+    Path IFileSystemInfo.Path => Path;
 
-        public bool Exists => _directory.Exists;
+    public bool Exists => _directory.Exists;
 
-        public bool Hidden => (_directory.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden;
+    public bool Hidden => (_directory.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden;
 
-        public DateTime LastWriteTime => _directory.LastWriteTime;
+    public DateTime LastWriteTime => _directory.LastWriteTime;
 
-        public Directory(DirectoryPath? path)
-        {
-            Path = path;
-            _directory = new DirectoryInfo(Path?.FullPath);
-        }
+    public Directory(DirectoryPath path)
+    {
+        Path = path;
+        _directory = new DirectoryInfo(Path?.FullPath);
+    }
 
-        public void Create()
-        {
-            _directory.Create();
-        }
+    public void Create()
+    {
+        _directory.Create();
+    }
 
-        public void Move(DirectoryPath destination)
+    public void Move(DirectoryPath destination)
+    {
+        if (destination == null)
         {
-            if (destination == null)
-            {
-                throw new ArgumentNullException(nameof(destination));
-            }
-            _directory.MoveTo(destination.FullPath);
+            throw new ArgumentNullException(nameof(destination));
         }
+        _directory.MoveTo(destination.FullPath);
+    }
 
-        public void Delete(bool recursive)
-        {
-            _directory.Delete(recursive);
-        }
+    public void Delete(bool recursive)
+    {
+        _directory.Delete(recursive);
+    }
 
-        public IEnumerable<IDirectory> GetDirectories(string filter, SearchScope scope)
-        {
-            var option = scope == SearchScope.Current ? SearchOption.TopDirectoryOnly : SearchOption.AllDirectories;
-            return _directory.GetDirectories(filter, option)
-                .Select(directory => new Directory(directory.FullName));
-        }
+    public IEnumerable<IDirectory> GetDirectories(string filter, SearchScope scope)
+    {
+        var option = scope == SearchScope.Current ? SearchOption.TopDirectoryOnly : SearchOption.AllDirectories;
+        return _directory.GetDirectories(filter, option)
+            .Select(directory => new Directory(directory.FullName));
+    }
 
-        public IEnumerable<IFile> GetFiles(string filter, SearchScope scope)
-        {
-            SearchOption option = scope == SearchScope.Current ? SearchOption.TopDirectoryOnly : SearchOption.AllDirectories;
-            return _directory.GetFiles(filter, option)
-                .Select(file => new File(file.FullName));
-        }
+    public IEnumerable<IFile> GetFiles(string filter, SearchScope scope)
+    {
+        SearchOption option = scope == SearchScope.Current ? SearchOption.TopDirectoryOnly : SearchOption.AllDirectories;
+        return _directory.GetFiles(filter, option)
+            .Select(file => new File(file.FullName));
     }
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/IO/DirectoryPath.cs b/src/LocalStack.AwsLocal/ProcessCore/IO/DirectoryPath.cs
index 0701836..0837042 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/IO/DirectoryPath.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/IO/DirectoryPath.cs
@@ -7,167 +7,163 @@
 *
 ***************************************************************************************/
 
-using System;
-using System.Linq;
+namespace LocalStack.AwsLocal.ProcessCore.IO;
 
-namespace LocalStack.AwsLocal.ProcessCore.IO
+/// <summary>
+/// Represents a directory path.
+/// </summary>
+public sealed class DirectoryPath : Path
 {
     /// <summary>
-    /// Represents a directory path.
+    /// Initializes a new instance of the <see cref="DirectoryPath"/> class.
     /// </summary>
-    public sealed class DirectoryPath : Path
+    /// <param name="path">The path.</param>
+    public DirectoryPath(string path)
+        : base(path)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DirectoryPath"/> class.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        public DirectoryPath(string path)
-            : base(path)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Gets the name of the directory.
-        /// </summary>
-        /// <returns>The directory name.</returns>
-        /// <remarks>
-        ///    If this is passed a file path, it will return the file name.
-        ///    This is by-and-large equivalent to how DirectoryInfo handles this scenario.
-        ///    If we wanted to return the *actual* directory name, we'd need to pull in IFileSystem,
-        ///    and do various checks to make sure things exists.
-        /// </remarks>
-        public string GetDirectoryName()
-        {
-            return Segments.Last();
-        }
+    /// <summary>
+    /// Gets the name of the directory.
+    /// </summary>
+    /// <returns>The directory name.</returns>
+    /// <remarks>
+    ///    If this is passed a file path, it will return the file name.
+    ///    This is by-and-large equivalent to how DirectoryInfo handles this scenario.
+    ///    If we wanted to return the *actual* directory name, we'd need to pull in IFileSystem,
+    ///    and do various checks to make sure things exists.
+    /// </remarks>
+    public string GetDirectoryName()
+    {
+        return Segments.Last();
+    }
 
-        /// <summary>
-        /// Combines the current path with the file name of a <see cref="FilePath"/>.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A combination of the current path and the file name of the provided <see cref="FilePath"/>.</returns>
-        public FilePath GetFilePath(FilePath path)
+    /// <summary>
+    /// Combines the current path with the file name of a <see cref="FilePath"/>.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>A combination of the current path and the file name of the provided <see cref="FilePath"/>.</returns>
+    public FilePath GetFilePath(FilePath path)
+    {
+        if (path == null)
         {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-
-            return new FilePath(PathHelper.Combine(FullPath, path.GetFilename().FullPath));
+            throw new ArgumentNullException(nameof(path));
         }
 
-        /// <summary>
-        /// Combines the current path with a <see cref="FilePath"/>.
-        /// The provided <see cref="FilePath"/> must be relative.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A combination of the current path and the provided <see cref="FilePath"/>.</returns>
-        public FilePath CombineWithFilePath(FilePath? path)
-        {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-            if (!path.IsRelative)
-            {
-                throw new InvalidOperationException("Cannot combine a directory path with an absolute file path.");
-            }
-
-            return new FilePath(PathHelper.Combine(FullPath, path.FullPath));
-        }
+        return new FilePath(PathHelper.Combine(FullPath, path.GetFilename().FullPath));
+    }
 
-        /// <summary>
-        /// Combines the current path with another <see cref="DirectoryPath"/>.
-        /// The provided <see cref="DirectoryPath"/> must be relative.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A combination of the current path and the provided <see cref="DirectoryPath"/>.</returns>
-        public DirectoryPath Combine(DirectoryPath path)
+    /// <summary>
+    /// Combines the current path with a <see cref="FilePath"/>.
+    /// The provided <see cref="FilePath"/> must be relative.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>A combination of the current path and the provided <see cref="FilePath"/>.</returns>
+    public FilePath CombineWithFilePath(FilePath path)
+    {
+        if (path == null)
         {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-            if (!path.IsRelative)
-            {
-                throw new InvalidOperationException("Cannot combine a directory path with an absolute directory path.");
-            }
-
-            return new DirectoryPath(PathHelper.Combine(FullPath, path.FullPath));
+            throw new ArgumentNullException(nameof(path));
         }
-
-        /// <summary>
-        /// Makes the path absolute to another (absolute) path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>An absolute path.</returns>
-        public DirectoryPath MakeAbsolute(DirectoryPath path)
+        if (!path.IsRelative)
         {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-            if (path.IsRelative)
-            {
-                throw new Exception("The provided path cannot be relative.");
-            }
-            return IsRelative
-                ? path.Combine(this).Collapse()
-                : new DirectoryPath(FullPath);
+            throw new InvalidOperationException("Cannot combine a directory path with an absolute file path.");
         }
 
-        /// <summary>
-        /// Collapses a <see cref="DirectoryPath"/> containing ellipses.
-        /// </summary>
-        /// <returns>A collapsed <see cref="DirectoryPath"/>.</returns>
-        public DirectoryPath Collapse()
+        return new FilePath(PathHelper.Combine(FullPath, path.FullPath));
+    }
+
+    /// <summary>
+    /// Combines the current path with another <see cref="DirectoryPath"/>.
+    /// The provided <see cref="DirectoryPath"/> must be relative.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>A combination of the current path and the provided <see cref="DirectoryPath"/>.</returns>
+    public DirectoryPath Combine(DirectoryPath path)
+    {
+        if (path == null)
         {
-            return new DirectoryPath(PathCollapser.Collapse(this));
+            throw new ArgumentNullException(nameof(path));
         }
-
-        /// <summary>
-        /// Performs an implicit conversion from <see cref="System.String"/> to <see cref="DirectoryPath"/>.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A <see cref="DirectoryPath"/>.</returns>
-        public static implicit operator DirectoryPath?(string path)
+        if (!path.IsRelative)
         {
-            return path is null ? null : FromString(path);
+            throw new InvalidOperationException("Cannot combine a directory path with an absolute directory path.");
         }
 
-        /// <summary>
-        /// Performs a conversion from <see cref="System.String"/> to <see cref="DirectoryPath"/>.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A <see cref="DirectoryPath"/>.</returns>
-        public static DirectoryPath FromString(string path)
+        return new DirectoryPath(PathHelper.Combine(FullPath, path.FullPath));
+    }
+
+    /// <summary>
+    /// Makes the path absolute to another (absolute) path.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>An absolute path.</returns>
+    public DirectoryPath MakeAbsolute(DirectoryPath path)
+    {
+        if (path == null)
         {
-            return new DirectoryPath(path);
+            throw new ArgumentNullException(nameof(path));
         }
-
-        /// <summary>
-        /// Get the relative path to another directory.
-        /// </summary>
-        /// <param name="to">The target directory path.</param>
-        /// <returns>A <see cref="DirectoryPath"/>.</returns>
-        public DirectoryPath GetRelativePath(DirectoryPath to)
+        if (path.IsRelative)
         {
-            return RelativePathResolver.Resolve(this, to);
+            throw new Exception("The provided path cannot be relative.");
         }
+        return IsRelative
+            ? path.Combine(this).Collapse()
+            : new DirectoryPath(FullPath);
+    }
 
-        /// <summary>
-        /// Get the relative path to another file.
-        /// </summary>
-        /// <param name="to">The target file path.</param>
-        /// <returns>A <see cref="FilePath"/>.</returns>
-        public FilePath GetRelativePath(FilePath to)
-        {
-            if (to == null)
-            {
-                throw new ArgumentNullException(nameof(to));
-            }
+    /// <summary>
+    /// Collapses a <see cref="DirectoryPath"/> containing ellipses.
+    /// </summary>
+    /// <returns>A collapsed <see cref="DirectoryPath"/>.</returns>
+    public DirectoryPath Collapse()
+    {
+        return new DirectoryPath(PathCollapser.Collapse(this));
+    }
 
-            return GetRelativePath(to.GetDirectory()).GetFilePath(to.GetFilename());
+    /// <summary>
+    /// Performs an implicit conversion from <see cref="System.String"/> to <see cref="DirectoryPath"/>.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>A <see cref="DirectoryPath"/>.</returns>
+    public static implicit operator DirectoryPath(string path)
+    {
+        return path is null ? null : FromString(path);
+    }
+
+    /// <summary>
+    /// Performs a conversion from <see cref="System.String"/> to <see cref="DirectoryPath"/>.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>A <see cref="DirectoryPath"/>.</returns>
+    public static DirectoryPath FromString(string path)
+    {
+        return new DirectoryPath(path);
+    }
+
+    /// <summary>
+    /// Get the relative path to another directory.
+    /// </summary>
+    /// <param name="to">The target directory path.</param>
+    /// <returns>A <see cref="DirectoryPath"/>.</returns>
+    public DirectoryPath GetRelativePath(DirectoryPath to)
+    {
+        return RelativePathResolver.Resolve(this, to);
+    }
+
+    /// <summary>
+    /// Get the relative path to another file.
+    /// </summary>
+    /// <param name="to">The target file path.</param>
+    /// <returns>A <see cref="FilePath"/>.</returns>
+    public FilePath GetRelativePath(FilePath to)
+    {
+        if (to == null)
+        {
+            throw new ArgumentNullException(nameof(to));
         }
+
+        return GetRelativePath(to.GetDirectory()).GetFilePath(to.GetFilename());
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/IO/File.cs b/src/LocalStack.AwsLocal/ProcessCore/IO/File.cs
index 3bcbff9..e4be186 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/IO/File.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/IO/File.cs
@@ -17,9 +17,9 @@ internal sealed class File : IFile
     {
         private readonly FileInfo _file;
 
-        public FilePath? Path { get; }
+        public FilePath Path { get; }
 
-        Path? IFileSystemInfo.Path => Path;
+        Path IFileSystemInfo.Path => Path;
 
         public bool Exists => _file.Exists;
 
@@ -35,7 +35,7 @@ public FileAttributes Attributes
             set => _file.Attributes = value;
         }
 
-        public File(FilePath? path)
+        public File(FilePath path)
         {
             Path = path;
             _file = new FileInfo(path?.FullPath);
diff --git a/src/LocalStack.AwsLocal/ProcessCore/IO/FilePath.cs b/src/LocalStack.AwsLocal/ProcessCore/IO/FilePath.cs
index e63d938..f11b724 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/IO/FilePath.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/IO/FilePath.cs
@@ -7,192 +7,189 @@
 *
 ***************************************************************************************/
 
-using System;
+namespace LocalStack.AwsLocal.ProcessCore.IO;
 
-namespace LocalStack.AwsLocal.ProcessCore.IO
+/// <summary>
+/// Represents a file path.
+/// </summary>
+public sealed class FilePath : Path
 {
     /// <summary>
-    /// Represents a file path.
+    /// Gets a value indicating whether this path has a file extension.
     /// </summary>
-    public sealed class FilePath : Path
+    /// <value>
+    /// <c>true</c> if this file path has a file extension; otherwise, <c>false</c>.
+    /// </value>
+    public bool HasExtension => PathHelper.HasExtension(this);
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FilePath"/> class.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    public FilePath(string path)
+        : base(path)
     {
-        /// <summary>
-        /// Gets a value indicating whether this path has a file extension.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this file path has a file extension; otherwise, <c>false</c>.
-        /// </value>
-        public bool HasExtension => PathHelper.HasExtension(this);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FilePath"/> class.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        public FilePath(string path)
-            : base(path)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Gets the directory part of the path.
-        /// </summary>
-        /// <returns>The directory part of the path.</returns>
-        public DirectoryPath GetDirectory()
+    /// <summary>
+    /// Gets the directory part of the path.
+    /// </summary>
+    /// <returns>The directory part of the path.</returns>
+    public DirectoryPath GetDirectory()
+    {
+        var directory = PathHelper.GetDirectoryName(this);
+        if (string.IsNullOrWhiteSpace(directory))
         {
-            var directory = PathHelper.GetDirectoryName(this);
-            if (string.IsNullOrWhiteSpace(directory))
-            {
-                directory = "./";
-            }
-            return new DirectoryPath(directory);
+            directory = "./";
         }
+        return new DirectoryPath(directory);
+    }
 
-        /// <summary>
-        /// Gets the filename.
-        /// </summary>
-        /// <returns>The filename.</returns>
-        public FilePath GetFilename()
-        {
-            var filename = PathHelper.GetFileName(this) ?? "./";
-            return new FilePath(filename);
-        }
+    /// <summary>
+    /// Gets the filename.
+    /// </summary>
+    /// <returns>The filename.</returns>
+    public FilePath GetFilename()
+    {
+        var filename = PathHelper.GetFileName(this) ?? "./";
+        return new FilePath(filename);
+    }
 
-        /// <summary>
-        /// Gets the filename without its extension.
-        /// </summary>
-        /// <returns>The filename without its extension.</returns>
-        public FilePath GetFilenameWithoutExtension()
+    /// <summary>
+    /// Gets the filename without its extension.
+    /// </summary>
+    /// <returns>The filename without its extension.</returns>
+    public FilePath GetFilenameWithoutExtension()
+    {
+        var filename = PathHelper.GetFileNameWithoutExtension(this);
+        if (filename == null)
         {
-            var filename = PathHelper.GetFileNameWithoutExtension(this);
-            if (filename == null)
-            {
-                return new FilePath("./");
-            }
-
-            return new FilePath(filename);
+            return new FilePath("./");
         }
 
-        /// <summary>
-        /// Gets the file extension.
-        /// </summary>
-        /// <returns>The file extension.</returns>
-        public string? GetExtension()
-        {
-            var filename = PathHelper.GetFileName(this);
-            if (filename != null)
-            {
-                var index = filename.LastIndexOf('.');
-                if (index != -1)
-                {
-                    return filename.Substring(index, filename.Length - index);
-                }
-            }
-
-            return null;
-        }
+        return new FilePath(filename);
+    }
 
-        /// <summary>
-        /// Changes the file extension of the path.
-        /// </summary>
-        /// <param name="extension">The new extension.</param>
-        /// <returns>A new <see cref="FilePath"/> with a new extension.</returns>
-        public FilePath ChangeExtension(string extension)
+    /// <summary>
+    /// Gets the file extension.
+    /// </summary>
+    /// <returns>The file extension.</returns>
+    public string GetExtension()
+    {
+        var filename = PathHelper.GetFileName(this);
+        if (filename != null)
         {
-            var filename = PathHelper.ChangeExtension(this, extension);
-            if (filename == null)
+            var index = filename.LastIndexOf('.');
+            if (index != -1)
             {
-                return new FilePath("./");
+                return filename.Substring(index, filename.Length - index);
             }
-
-            return new FilePath(filename);
         }
 
-        /// <summary>
-        /// Appends a file extension to the path.
-        /// </summary>
-        /// <param name="extension">The extension.</param>
-        /// <returns>A new <see cref="FilePath"/> with an appended extension.</returns>
-        public FilePath AppendExtension(string extension)
-        {
-            if (extension == null)
-            {
-                throw new ArgumentNullException(nameof(extension));
-            }
-            if (!extension.StartsWith(".", StringComparison.OrdinalIgnoreCase))
-            {
-                extension = string.Concat(".", extension);
-            }
-            return new FilePath(string.Concat(FullPath, extension));
-        }
+        return null;
+    }
 
-        /// <summary>
-        /// Makes the path absolute (if relative) using the specified directory path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>An absolute path.</returns>
-        public FilePath MakeAbsolute(DirectoryPath path)
+    /// <summary>
+    /// Changes the file extension of the path.
+    /// </summary>
+    /// <param name="extension">The new extension.</param>
+    /// <returns>A new <see cref="FilePath"/> with a new extension.</returns>
+    public FilePath ChangeExtension(string extension)
+    {
+        var filename = PathHelper.ChangeExtension(this, extension);
+        if (filename == null)
         {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-            if (path.IsRelative)
-            {
-                throw new InvalidOperationException("Cannot make a file path absolute with a relative directory path.");
-            }
-
-            return IsRelative
-                ? path.CombineWithFilePath(this).Collapse()
-                : new FilePath(FullPath);
+            return new FilePath("./");
         }
 
-        /// <summary>
-        /// Collapses a <see cref="FilePath"/> containing ellipses.
-        /// </summary>
-        /// <returns>A collapsed <see cref="FilePath"/>.</returns>
-        public FilePath Collapse()
-        {
-            return new FilePath(PathCollapser.Collapse(this));
-        }
+        return new FilePath(filename);
+    }
 
-        /// <summary>
-        /// Performs an implicit conversion from <see cref="System.String"/> to <see cref="FilePath"/>.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A <see cref="FilePath"/>.</returns>
-        public static implicit operator FilePath?(string path)
+    /// <summary>
+    /// Appends a file extension to the path.
+    /// </summary>
+    /// <param name="extension">The extension.</param>
+    /// <returns>A new <see cref="FilePath"/> with an appended extension.</returns>
+    public FilePath AppendExtension(string extension)
+    {
+        if (extension == null)
         {
-            return path is null ? null : FromString(path);
+            throw new ArgumentNullException(nameof(extension));
         }
-
-        /// <summary>
-        /// Performs a conversion from <see cref="System.String"/> to <see cref="FilePath"/>.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A <see cref="FilePath"/>.</returns>
-        public static FilePath FromString(string path)
+        if (!extension.StartsWith(".", StringComparison.OrdinalIgnoreCase))
         {
-            return new FilePath(path);
+            extension = string.Concat(".", extension);
         }
+        return new FilePath(string.Concat(FullPath, extension));
+    }
 
-        /// <summary>
-        /// Get the relative path to another directory.
-        /// </summary>
-        /// <param name="to">The target directory path.</param>
-        /// <returns>A <see cref="DirectoryPath"/>.</returns>
-        public DirectoryPath GetRelativePath(DirectoryPath to)
+    /// <summary>
+    /// Makes the path absolute (if relative) using the specified directory path.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>An absolute path.</returns>
+    public FilePath MakeAbsolute(DirectoryPath path)
+    {
+        if (path == null)
         {
-            return GetDirectory().GetRelativePath(to);
+            throw new ArgumentNullException(nameof(path));
         }
-
-        /// <summary>
-        /// Get the relative path to another file.
-        /// </summary>
-        /// <param name="to">The target file path.</param>
-        /// <returns>A <see cref="FilePath"/>.</returns>
-        public FilePath GetRelativePath(FilePath to)
+        if (path.IsRelative)
         {
-            return GetDirectory().GetRelativePath(to);
+            throw new InvalidOperationException("Cannot make a file path absolute with a relative directory path.");
         }
+
+        return IsRelative
+            ? path.CombineWithFilePath(this).Collapse()
+            : new FilePath(FullPath);
+    }
+
+    /// <summary>
+    /// Collapses a <see cref="FilePath"/> containing ellipses.
+    /// </summary>
+    /// <returns>A collapsed <see cref="FilePath"/>.</returns>
+    public FilePath Collapse()
+    {
+        return new FilePath(PathCollapser.Collapse(this));
+    }
+
+    /// <summary>
+    /// Performs an implicit conversion from <see cref="System.String"/> to <see cref="FilePath"/>.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>A <see cref="FilePath"/>.</returns>
+    public static implicit operator FilePath(string path)
+    {
+        return path is null ? null : FromString(path);
+    }
+
+    /// <summary>
+    /// Performs a conversion from <see cref="System.String"/> to <see cref="FilePath"/>.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>A <see cref="FilePath"/>.</returns>
+    public static FilePath FromString(string path)
+    {
+        return new FilePath(path);
+    }
+
+    /// <summary>
+    /// Get the relative path to another directory.
+    /// </summary>
+    /// <param name="to">The target directory path.</param>
+    /// <returns>A <see cref="DirectoryPath"/>.</returns>
+    public DirectoryPath GetRelativePath(DirectoryPath to)
+    {
+        return GetDirectory().GetRelativePath(to);
+    }
+
+    /// <summary>
+    /// Get the relative path to another file.
+    /// </summary>
+    /// <param name="to">The target file path.</param>
+    /// <returns>A <see cref="FilePath"/>.</returns>
+    public FilePath GetRelativePath(FilePath to)
+    {
+        return GetDirectory().GetRelativePath(to);
     }
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/IO/FileSystem.cs b/src/LocalStack.AwsLocal/ProcessCore/IO/FileSystem.cs
index b5fab8a..cc55d7d 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/IO/FileSystem.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/IO/FileSystem.cs
@@ -7,33 +7,30 @@
 *
 ***************************************************************************************/
 
-using LocalStack.AwsLocal.Contracts;
+namespace LocalStack.AwsLocal.ProcessCore.IO;
 
-namespace LocalStack.AwsLocal.ProcessCore.IO
+/// <summary>
+/// A physical file system implementation.
+/// </summary>
+public sealed class FileSystem : IFileSystem
 {
     /// <summary>
-    /// A physical file system implementation.
+    /// Gets a <see cref="IFile" /> instance representing the specified path.
     /// </summary>
-    public sealed class FileSystem : IFileSystem
+    /// <param name="path">The path.</param>
+    /// <returns>A <see cref="IFile" /> instance representing the specified path.</returns>
+    public IFile GetFile(FilePath path)
     {
-        /// <summary>
-        /// Gets a <see cref="IFile" /> instance representing the specified path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A <see cref="IFile" /> instance representing the specified path.</returns>
-        public IFile GetFile(FilePath path)
-        {
-            return new File(path);
-        }
+        return new File(path);
+    }
 
-        /// <summary>
-        /// Gets a <see cref="IDirectory" /> instance representing the specified path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A <see cref="IDirectory" /> instance representing the specified path.</returns>
-        public IDirectory GetDirectory(DirectoryPath path)
-        {
-            return new Directory(path);
-        }
+    /// <summary>
+    /// Gets a <see cref="IDirectory" /> instance representing the specified path.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>A <see cref="IDirectory" /> instance representing the specified path.</returns>
+    public IDirectory GetDirectory(DirectoryPath path)
+    {
+        return new Directory(path);
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/IO/Path.cs b/src/LocalStack.AwsLocal/ProcessCore/IO/Path.cs
index e828252..fc4b7ba 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/IO/Path.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/IO/Path.cs
@@ -7,138 +7,135 @@
 *
 ***************************************************************************************/
 
-using System;
+namespace LocalStack.AwsLocal.ProcessCore.IO;
 
-namespace LocalStack.AwsLocal.ProcessCore.IO
+/// <summary>
+/// Provides properties and instance methods for working with paths.
+/// This class must be inherited.
+/// </summary>
+public abstract class Path
 {
     /// <summary>
-    /// Provides properties and instance methods for working with paths.
-    /// This class must be inherited.
+    /// Gets the full path.
     /// </summary>
-    public abstract class Path
+    /// <value>The full path.</value>
+    public string FullPath { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether or not this path is relative.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this path is relative; otherwise, <c>false</c>.
+    /// </value>
+    public bool IsRelative { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether or not this path is an UNC path.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this path is an UNC path; otherwise, <c>false</c>.
+    /// </value>
+    public bool IsUNC { get; }
+
+    /// <summary>
+    /// Gets the separator this path was normalized with.
+    /// </summary>
+    public char Separator { get; }
+
+    /// <summary>
+    /// Gets the segments making up the path.
+    /// </summary>
+    /// <value>The segments making up the path.</value>
+    public string[] Segments { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Path"/> class.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    protected Path(string path)
     {
-        /// <summary>
-        /// Gets the full path.
-        /// </summary>
-        /// <value>The full path.</value>
-        public string FullPath { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether or not this path is relative.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this path is relative; otherwise, <c>false</c>.
-        /// </value>
-        public bool IsRelative { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether or not this path is an UNC path.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this path is an UNC path; otherwise, <c>false</c>.
-        /// </value>
-        public bool IsUNC { get; }
-
-        /// <summary>
-        /// Gets the separator this path was normalized with.
-        /// </summary>
-        public char Separator { get; }
-
-        /// <summary>
-        /// Gets the segments making up the path.
-        /// </summary>
-        /// <value>The segments making up the path.</value>
-        public string[] Segments { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Path"/> class.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        protected Path(string path)
-        {
-            path = path?.Trim() ?? string.Empty;
+        path = path?.Trim() ?? string.Empty;
 
-            IsUNC = path.StartsWith(@"\\");
-            Separator = IsUNC ? '\\' : '/';
+        IsUNC = path.StartsWith(@"\\");
+        Separator = IsUNC ? '\\' : '/';
 
-            if (IsUNC)
-            {
-                FullPath = path.Replace('/', Separator).Trim();
-            }
-            else
-            {
-                FullPath = path.Replace('\\', Separator).Trim();
-            }
+        if (IsUNC)
+        {
+            FullPath = path.Replace('/', Separator).Trim();
+        }
+        else
+        {
+            FullPath = path.Replace('\\', Separator).Trim();
+        }
 
-            // Relative paths are considered empty.
-            FullPath = FullPath == "./" ? string.Empty : FullPath;
+        // Relative paths are considered empty.
+        FullPath = FullPath == "./" ? string.Empty : FullPath;
 
-            // Remove relative part of a path.
-            if (FullPath.StartsWith("./", StringComparison.Ordinal))
-            {
-                FullPath = FullPath.Substring(2);
-            }
+        // Remove relative part of a path.
+        if (FullPath.StartsWith("./", StringComparison.Ordinal))
+        {
+            FullPath = FullPath.Substring(2);
+        }
 
-            // Remove trailing slashes.
-            if (FullPath.Length > 1)
+        // Remove trailing slashes.
+        if (FullPath.Length > 1)
+        {
+            FullPath = FullPath.TrimEnd(Separator);
+            if (IsUNC && string.IsNullOrWhiteSpace(FullPath))
             {
-                FullPath = FullPath.TrimEnd(Separator);
-                if (IsUNC && string.IsNullOrWhiteSpace(FullPath))
-                {
-                    FullPath = @"\\";
-                }
+                FullPath = @"\\";
             }
+        }
 
-            // Potential Windows path?
-            if (FullPath.Length == 2)
+        // Potential Windows path?
+        if (FullPath.Length == 2)
+        {
+            if (FullPath.EndsWith(":", StringComparison.OrdinalIgnoreCase))
             {
-                if (FullPath.EndsWith(":", StringComparison.OrdinalIgnoreCase))
-                {
-                    FullPath = string.Concat(FullPath, Separator);
-                }
+                FullPath = string.Concat(FullPath, Separator);
             }
+        }
 
-            // Relative path?
-            IsRelative = !PathHelper.IsPathRooted(FullPath);
+        // Relative path?
+        IsRelative = !PathHelper.IsPathRooted(FullPath);
 
-            // Extract path segments.
-            Segments = FullPath.Split(new[] { Separator }, StringSplitOptions.RemoveEmptyEntries);
-            if (!IsUNC)
+        // Extract path segments.
+        Segments = FullPath.Split(new[] { Separator }, StringSplitOptions.RemoveEmptyEntries);
+        if (!IsUNC)
+        {
+            if (FullPath.StartsWith("/") && Segments.Length > 0)
             {
-                if (FullPath.StartsWith("/") && Segments.Length > 0)
-                {
-                    Segments[0] = "/" + Segments[0];
-                }
+                Segments[0] = "/" + Segments[0];
             }
-            else
+        }
+        else
+        {
+            if (FullPath.StartsWith(@"\\"))
             {
-                if (FullPath.StartsWith(@"\\"))
+                if (Segments.Length > 0)
+                {
+                    // Treat \\ as its own segment.
+                    var segments = new string[Segments.Length + 1];
+                    segments[0] = @"\\";
+                    Segments.CopyTo(segments, 1);
+                    Segments = segments;
+                }
+                else
                 {
-                    if (Segments.Length > 0)
-                    {
-                        // Treat \\ as its own segment.
-                        var segments = new string[Segments.Length + 1];
-                        segments[0] = @"\\";
-                        Segments.CopyTo(segments, 1);
-                        Segments = segments;
-                    }
-                    else
-                    {
-                        Segments = new[] { @"\\" };
-                    }
+                    Segments = new[] { @"\\" };
                 }
             }
         }
+    }
 
-        /// <summary>
-        /// Returns a <see cref="System.String" /> that represents this path.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="System.String" /> that represents this instance.
-        /// </returns>
-        public override string ToString()
-        {
-            return FullPath;
-        }
+    /// <summary>
+    /// Returns a <see cref="System.String" /> that represents this path.
+    /// </summary>
+    /// <returns>
+    /// A <see cref="System.String" /> that represents this instance.
+    /// </returns>
+    public override string ToString()
+    {
+        return FullPath;
     }
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/IO/PathCollapser.cs b/src/LocalStack.AwsLocal/ProcessCore/IO/PathCollapser.cs
index 4407cdf..1c3f2c7 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/IO/PathCollapser.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/IO/PathCollapser.cs
@@ -7,43 +7,38 @@
 *
 ***************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
+namespace LocalStack.AwsLocal.ProcessCore.IO;
 
-namespace LocalStack.AwsLocal.ProcessCore.IO
+internal static class PathCollapser
 {
-    internal static class PathCollapser
+    public static string Collapse(Path path)
     {
-        public static string Collapse(Path path)
+        if (path == null)
         {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-            var stack = new Stack<string>();
-            var segments = path.FullPath.Split('/', '\\');
-            foreach (string segment in segments)
+            throw new ArgumentNullException(nameof(path));
+        }
+        var stack = new Stack<string>();
+        string[] segments = path.FullPath.Split('/', '\\');
+        foreach (string segment in segments)
+        {
+            switch (segment)
             {
-                switch (segment)
+                case ".":
+                    continue;
+                case "..":
                 {
-                    case ".":
-                        continue;
-                    case "..":
+                    if (stack.Count > 1)
                     {
-                        if (stack.Count > 1)
-                        {
-                            stack.Pop();
-                        }
-                        continue;
+                        stack.Pop();
                     }
-                    default:
-                        stack.Push(segment);
-                        break;
+                    continue;
                 }
+                default:
+                    stack.Push(segment);
+                    break;
             }
-            string collapsed = string.Join("/", stack.Reverse());
-            return collapsed == string.Empty ? "." : collapsed;
         }
+        string collapsed = string.Join("/", stack.Reverse());
+        return collapsed == string.Empty ? "." : collapsed;
     }
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/IO/PathHelper.cs b/src/LocalStack.AwsLocal/ProcessCore/IO/PathHelper.cs
index 6de26f9..54b24df 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/IO/PathHelper.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/IO/PathHelper.cs
@@ -7,290 +7,280 @@
 *
 ***************************************************************************************/
 
-using System;
-using System.Linq;
-using System.Runtime.InteropServices;
+namespace LocalStack.AwsLocal.ProcessCore.IO;
 
-namespace LocalStack.AwsLocal.ProcessCore.IO
+internal static class PathHelper
 {
-    internal static class PathHelper
+    private const char Backslash = '\\';
+    private const char Slash = '/';
+    private const string UncPrefix = @"\\";
+
+    private static readonly bool IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+
+    public static string Combine(params string[] paths)
     {
-        private const char Backslash = '\\';
-        private const char Slash = '/';
-        private const string UncPrefix = @"\\";
+        if (paths.Length == 0)
+        {
+            return string.Empty;
+        }
 
-        private static readonly bool _isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+        string current = paths[0];
+        
+        for (var index = 1; index < paths.Length; index++)
+        {
+            current = PathHelper.Combine(current, paths[index]);
+        }
+        return current;
+    }
 
-        public static string Combine(params string[] paths)
+    public static string Combine(string first, string second)
+    {
+        if (first == null)
         {
-            if (paths.Length == 0)
-            {
-                return string.Empty;
-            }
+            throw new ArgumentNullException(nameof(first));
+        }
+        if (second == null)
+        {
+            throw new ArgumentNullException(nameof(second));
+        }
 
-            var current = paths[0];
-            for (int index = 1; index < paths.Length; index++)
-            {
-                current = PathHelper.Combine(current, paths[index]);
-            }
-            return current;
+        // Both empty?
+        if (string.IsNullOrWhiteSpace(first) && string.IsNullOrWhiteSpace(second))
+        {
+            return string.Empty;
+        }
+        // First empty?
+        if (string.IsNullOrWhiteSpace(first) && !string.IsNullOrWhiteSpace(second))
+        {
+            return second;
+        }
+        // Second empty?
+        if (!string.IsNullOrWhiteSpace(first) && string.IsNullOrWhiteSpace(second))
+        {
+            return first;
         }
 
-        public static string Combine(string first, string second)
+        bool isUnc = first.StartsWith(UncPrefix);
+
+        // Trim separators.
+        first = first.TrimEnd(Backslash, Slash);
+        second = second.TrimStart(Backslash, Slash).TrimEnd(Backslash, Slash);
+
+        // UNC root only?
+        if (isUnc && string.IsNullOrWhiteSpace(first))
         {
-            if (first == null)
-            {
-                throw new ArgumentNullException(nameof(first));
-            }
-            if (second == null)
-            {
-                throw new ArgumentNullException(nameof(second));
-            }
+            return string.Concat(UncPrefix, second);
+        }
+
+        char separator = isUnc ? Backslash : Slash;
+        return string.Concat(first, separator, second);
+    }
 
-            // Both empty?
-            if (string.IsNullOrWhiteSpace(first) && string.IsNullOrWhiteSpace(second))
+    public static bool HasExtension(FilePath path)
+    {
+        if (path == null)
+        {
+            throw new ArgumentNullException(nameof(path));
+        }
+
+        for (int index = path.FullPath.Length - 1; index >= 0; index--)
+        {
+            if (path.FullPath[index] == '.')
             {
-                return string.Empty;
+                return true;
             }
-            // First empty?
-            if (string.IsNullOrWhiteSpace(first) && !string.IsNullOrWhiteSpace(second))
+
+            if (path.IsUNC && path.FullPath[index] == '\\')
             {
-                return second;
+                break;
             }
-            // Second empty?
-            if (!string.IsNullOrWhiteSpace(first) && string.IsNullOrWhiteSpace(second))
+            if (path.FullPath[index] == '/')
             {
-                return first;
+                break;
             }
+        }
 
-            var isUnc = first.StartsWith(UncPrefix);
-
-            // Trim separators.
-            first = first.TrimEnd(Backslash, Slash);
-            second = second.TrimStart(Backslash, Slash).TrimEnd(Backslash, Slash);
+        return false;
+    }
 
-            // UNC root only?
-            if (isUnc && string.IsNullOrWhiteSpace(first))
-            {
-                return string.Concat(UncPrefix, second);
-            }
+    public static string GetDirectoryName(FilePath path)
+    {
+        if (path == null)
+        {
+            throw new ArgumentNullException(nameof(path));
+        }
 
-            var separator = isUnc ? Backslash : Slash;
-            return string.Concat(first, separator, second);
+        switch (path.Segments.Length)
+        {
+            case 0:
+                return string.Empty;
+            case 1 when path.IsUNC:
+                return @"\\";
+            case 1 when path.Segments[0].Length >= 1 && path.Segments[0][0] == '/':
+                return "/";
         }
 
-        public static bool HasExtension(FilePath path)
+        if (!path.IsUNC)
         {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
+            return string.Join("/", path.Segments.Take(path.Segments.Length - 1));
+        }
 
-            for (int index = path.FullPath.Length - 1; index >= 0; index--)
-            {
-                if (path.FullPath[index] == '.')
-                {
-                    return true;
-                }
+        IEnumerable<string> segments = path.Segments.Skip(1).Take(path.Segments.Length - 2);
+        return string.Concat(@"\\", string.Join("\\", segments));
 
-                if (path.IsUNC && path.FullPath[index] == '\\')
-                {
-                    break;
-                }
-                if (path.FullPath[index] == '/')
-                {
-                    break;
-                }
-            }
+    }
 
-            return false;
+    public static string GetFileName(FilePath path)
+    {
+        if (path == null)
+        {
+            throw new ArgumentNullException(nameof(path));
         }
 
-        public static string GetDirectoryName(FilePath path)
+        if (path.Segments.Length == 0)
         {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-
-            if (path.Segments.Length == 0)
-            {
-                return string.Empty;
-            }
+            return null;
+        }
 
-            if (path.Segments.Length == 1)
+        var filename = path.Segments[path.Segments.Length - 1];
+        if (path.Segments.Length == 1 && !path.IsRelative)
+        {
+            if (path.Segments[0].StartsWith("/"))
             {
-                if (path.IsUNC)
-                {
-                    return @"\\";
-                }
-                if (path.Segments[0].Length >= 1 && path.Segments[0][0] == '/')
-                {
-                    return "/";
-                }
+                return filename.TrimStart('/');
             }
-
             if (path.IsUNC)
             {
-                var segments = path.Segments.Skip(1).Take(path.Segments.Length - 2);
-                return string.Concat(@"\\", string.Join("\\", segments));
+                return filename.TrimStart('\\');
             }
 
-            return string.Join("/", path.Segments.Take(path.Segments.Length - 1));
+            return null;
         }
 
-        public static string? GetFileName(FilePath path)
-        {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
+        return filename;
+    }
 
-            if (path.Segments.Length == 0)
-            {
-                return null;
-            }
+    public static string GetFileNameWithoutExtension(FilePath path)
+    {
+        var filename = PathHelper.GetFileName(path);
+        if (filename == null)
+        {
+            return null;
+        }
 
-            var filename = path.Segments[path.Segments.Length - 1];
-            if (path.Segments.Length == 1 && !path.IsRelative)
-            {
-                if (path.Segments[0].StartsWith("/"))
-                {
-                    return filename.TrimStart('/');
-                }
-                if (path.IsUNC)
-                {
-                    return filename.TrimStart('\\');
-                }
+        var index = filename.LastIndexOf('.');
+        if (index != -1)
+        {
+            return filename.Substring(0, index);
+        }
 
-                return null;
-            }
+        return filename;
+    }
 
-            return filename;
+    public static string ChangeExtension(FilePath path, string extension)
+    {
+        if (path == null)
+        {
+            throw new ArgumentNullException(nameof(path));
         }
 
-        public static string? GetFileNameWithoutExtension(FilePath path)
+        if (extension == null)
         {
-            var filename = PathHelper.GetFileName(path);
-            if (filename == null)
-            {
-                return null;
-            }
-
-            var index = filename.LastIndexOf('.');
-            if (index != -1)
-            {
-                return filename.Substring(0, index);
-            }
+            return RemoveExtension(path);
+        }
+        if (extension != null && string.IsNullOrWhiteSpace(extension))
+        {
+            // Empty extension is an extension consisting of only a period.
+            extension = ".";
+        }
 
-            return filename;
+        // Make sure that the extension has a dot.
+        if (extension != null && !extension.StartsWith("."))
+        {
+            extension = string.Concat(".", extension);
         }
 
-        public static string? ChangeExtension(FilePath path, string extension)
+        // Empty path?
+        var filename = path.FullPath;
+        if (string.IsNullOrWhiteSpace(filename))
         {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
+            return null;
+        }
 
-            if (extension == null)
+        for (int index = path.FullPath.Length - 1; index >= 0; index--)
+        {
+            if (filename[index] == '/')
             {
-                return RemoveExtension(path);
+                // No extension found.
+                break;
             }
-            if (extension != null && string.IsNullOrWhiteSpace(extension))
+            if (filename[index] == '.')
             {
-                // Empty extension is an extension consisting of only a period.
-                extension = ".";
+                // Replace the extension.
+                return string.Concat(filename.Substring(0, index), extension);
             }
+        }
+
+        return string.Concat(filename, extension);
+    }
+
+    public static string RemoveExtension(FilePath path)
+    {
+        if (path == null)
+        {
+            throw new ArgumentNullException(nameof(path));
+        }
 
-            // Make sure that the extension has a dot.
-            if (extension != null && !extension.StartsWith("."))
+        for (int index = path.FullPath.Length - 1; index >= 0; index--)
+        {
+            if (path.FullPath[index] == '.')
             {
-                extension = string.Concat(".", extension);
+                return path.FullPath.Substring(0, index);
             }
 
-            // Empty path?
-            var filename = path.FullPath;
-            if (string.IsNullOrWhiteSpace(filename))
+            if (path.IsUNC && path.FullPath[index] == '\\')
             {
-                return null;
+                break;
             }
-
-            for (int index = path.FullPath.Length - 1; index >= 0; index--)
+            if (path.FullPath[index] == '/')
             {
-                if (filename[index] == '/')
-                {
-                    // No extension found.
-                    break;
-                }
-                if (filename[index] == '.')
-                {
-                    // Replace the extension.
-                    return string.Concat(filename.Substring(0, index), extension);
-                }
+                break;
             }
-
-            return string.Concat(filename, extension);
         }
 
-        public static string RemoveExtension(FilePath path)
+        return path.FullPath;
+    }
+
+    public static bool IsPathRooted(string path)
+    {
+        var length = path.Length;
+        if (length >= 1)
         {
-            if (path == null)
+            // Root?
+            if (path[0] == '/')
             {
-                throw new ArgumentNullException(nameof(path));
+                return true;
             }
 
-            for (int index = path.FullPath.Length - 1; index >= 0; index--)
+            if (path.Length >= 2)
             {
-                if (path.FullPath[index] == '.')
+                // UNC?
+                if (path[0] == '\\' && path[1] == '\\')
                 {
-                    return path.FullPath.Substring(0, index);
-                }
-
-                if (path.IsUNC && path.FullPath[index] == '\\')
-                {
-                    break;
-                }
-                if (path.FullPath[index] == '/')
-                {
-                    break;
+                    return true;
                 }
             }
 
-            return path.FullPath;
-        }
-
-        public static bool IsPathRooted(string path)
-        {
-            var length = path.Length;
-            if (length >= 1)
+            if (IsWindows)
             {
-                // Root?
-                if (path[0] == '/')
+                // Windows drive?
+                if (length >= 2 && path[1] == ':')
                 {
                     return true;
                 }
-
-                if (path.Length >= 2)
-                {
-                    // UNC?
-                    if (path[0] == '\\' && path[1] == '\\')
-                    {
-                        return true;
-                    }
-                }
-
-                if (_isWindows)
-                {
-                    // Windows drive?
-                    if (length >= 2 && path[1] == ':')
-                    {
-                        return true;
-                    }
-                }
             }
-
-            return false;
         }
+
+        return false;
     }
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/IO/RelativePathResolver.cs b/src/LocalStack.AwsLocal/ProcessCore/IO/RelativePathResolver.cs
index b54cd3b..8b0f7c2 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/IO/RelativePathResolver.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/IO/RelativePathResolver.cs
@@ -7,69 +7,65 @@
 *
 ***************************************************************************************/
 
-using System;
-using System.Linq;
+namespace LocalStack.AwsLocal.ProcessCore.IO;
 
-namespace LocalStack.AwsLocal.ProcessCore.IO
+internal static class RelativePathResolver
 {
-    internal static class RelativePathResolver
+    public static DirectoryPath Resolve(DirectoryPath from, DirectoryPath to)
     {
-        public static DirectoryPath Resolve(DirectoryPath from, DirectoryPath to)
+        if (from == null)
         {
-            if (from == null)
-            {
-                throw new ArgumentNullException(nameof(from));
-            }
-            if (to == null)
-            {
-                throw new ArgumentNullException(nameof(to));
-            }
-            if (to.IsRelative)
-            {
-                throw new InvalidOperationException("Target path must be an absolute path.");
-            }
-            if (from.IsRelative)
-            {
-                throw new InvalidOperationException("Source path must be an absolute path.");
-            }
-            if (from.Segments.Length == 0 && to.Segments.Length == 0)
-            {
-                return new DirectoryPath(".");
-            }
-            if (from.Segments[0] != to.Segments[0])
-            {
-                throw new InvalidOperationException("Paths must share a common prefix.");
-            }
+            throw new ArgumentNullException(nameof(from));
+        }
+        if (to == null)
+        {
+            throw new ArgumentNullException(nameof(to));
+        }
+        if (to.IsRelative)
+        {
+            throw new InvalidOperationException("Target path must be an absolute path.");
+        }
+        if (from.IsRelative)
+        {
+            throw new InvalidOperationException("Source path must be an absolute path.");
+        }
+        if (from.Segments.Length == 0 && to.Segments.Length == 0)
+        {
+            return new DirectoryPath(".");
+        }
+        if (from.Segments[0] != to.Segments[0])
+        {
+            throw new InvalidOperationException("Paths must share a common prefix.");
+        }
 
-            if (string.CompareOrdinal(from.FullPath, to.FullPath) == 0)
-            {
-                return new DirectoryPath(".");
-            }
+        if (string.CompareOrdinal(from.FullPath, to.FullPath) == 0)
+        {
+            return new DirectoryPath(".");
+        }
 
-            var minimumSegmentsLength = Math.Min(from.Segments.Length, to.Segments.Length);
-            var numberOfSharedSegments = 1;
+        int minimumSegmentsLength = Math.Min(from.Segments.Length, to.Segments.Length);
+        var numberOfSharedSegments = 1;
 
-            for (var i = 1; i < minimumSegmentsLength; i++)
+        for (var i = 1; i < minimumSegmentsLength; i++)
+        {
+            if (string.CompareOrdinal(from.Segments[i], to.Segments[i]) != 0)
             {
-                if (string.CompareOrdinal(from.Segments[i], to.Segments[i]) != 0)
-                {
-                    break;
-                }
-
-                numberOfSharedSegments++;
+                break;
             }
 
-            var fromSegments = Enumerable.Repeat("..", from.Segments.Length - numberOfSharedSegments);
-            var toSegments = to.Segments.Skip(numberOfSharedSegments);
+            numberOfSharedSegments++;
+        }
 
-            var relativePath = PathHelper.Combine(fromSegments.Concat(toSegments).ToArray());
+        IEnumerable<string> fromSegments = Enumerable.Repeat("..", from.Segments.Length - numberOfSharedSegments);
+        IEnumerable<string> toSegments = to.Segments.Skip(numberOfSharedSegments);
 
-            if (string.IsNullOrWhiteSpace(relativePath))
-            {
-                relativePath = ".";
-            }
+        string relativePath = PathHelper.Combine(fromSegments.Concat(toSegments).ToArray());
 
-            return new DirectoryPath(relativePath);
+        if (string.IsNullOrWhiteSpace(relativePath))
+        {
+            relativePath = ".";
         }
+
+        return new DirectoryPath(relativePath);
     }
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/IO/SearchScope.cs b/src/LocalStack.AwsLocal/ProcessCore/IO/SearchScope.cs
index 93e4735..a30c434 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/IO/SearchScope.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/IO/SearchScope.cs
@@ -7,21 +7,20 @@
 *
 ***************************************************************************************/
 
-namespace LocalStack.AwsLocal.ProcessCore.IO
+namespace LocalStack.AwsLocal.ProcessCore.IO;
+
+/// <summary>
+/// Represents a search scope.
+/// </summary>
+public enum SearchScope
 {
     /// <summary>
-    /// Represents a search scope.
+    /// The current directory.
     /// </summary>
-    public enum SearchScope
-    {
-        /// <summary>
-        /// The current directory.
-        /// </summary>
-        Current,
+    Current,
 
-        /// <summary>
-        /// The current directory and child directories.
-        /// </summary>
-        Recursive
-    }
+    /// <summary>
+    /// The current directory and child directories.
+    /// </summary>
+    Recursive
 }
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/ProcessArgumentBuilder.cs b/src/LocalStack.AwsLocal/ProcessCore/ProcessArgumentBuilder.cs
index 9903842..6b44536 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/ProcessArgumentBuilder.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/ProcessArgumentBuilder.cs
@@ -8,149 +8,140 @@
 ***************************************************************************************/
 
 
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using LocalStack.AwsLocal.Contracts;
-using LocalStack.AwsLocal.ProcessCore.Arguments;
-using LocalStack.AwsLocal.ProcessCore.IO;
-
-namespace LocalStack.AwsLocal.ProcessCore
+namespace LocalStack.AwsLocal.ProcessCore;
+
+/// <summary>
+/// Utility for building process arguments.
+/// </summary>
+public sealed class ProcessArgumentBuilder : IReadOnlyCollection<IProcessArgument>
 {
+    private readonly List<IProcessArgument> _tokens;
+
     /// <summary>
-    /// Utility for building process arguments.
+    /// Gets the number of arguments contained in the <see cref="ProcessArgumentBuilder"/>.
     /// </summary>
-    public sealed class ProcessArgumentBuilder : IReadOnlyCollection<IProcessArgument>
-    {
-        private readonly List<IProcessArgument> _tokens;
+    public int Count => _tokens.Count;
 
-        /// <summary>
-        /// Gets the number of arguments contained in the <see cref="ProcessArgumentBuilder"/>.
-        /// </summary>
-        public int Count => _tokens.Count;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProcessArgumentBuilder"/> class.
+    /// </summary>
+    public ProcessArgumentBuilder()
+    {
+        _tokens = new List<IProcessArgument>();
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProcessArgumentBuilder"/> class.
-        /// </summary>
-        public ProcessArgumentBuilder()
-        {
-            _tokens = new List<IProcessArgument>();
-        }
+    /// <summary>
+    /// Clears all arguments from the builder.
+    /// </summary>
+    public void Clear()
+    {
+        _tokens.Clear();
+    }
 
-        /// <summary>
-        /// Clears all arguments from the builder.
-        /// </summary>
-        public void Clear()
-        {
-            _tokens.Clear();
-        }
+    /// <summary>
+    /// Appends an argument.
+    /// </summary>
+    /// <param name="argument">The argument.</param>
+    public void Append(IProcessArgument argument)
+    {
+        _tokens.Add(argument);
+    }
 
-        /// <summary>
-        /// Appends an argument.
-        /// </summary>
-        /// <param name="argument">The argument.</param>
-        public void Append(IProcessArgument argument)
-        {
-            _tokens.Add(argument);
-        }
+    /// <summary>
+    /// Prepends an argument.
+    /// </summary>
+    /// <param name="argument">The argument.</param>
+    public void Prepend(IProcessArgument argument)
+    {
+        _tokens.Insert(0, argument);
+    }
 
-        /// <summary>
-        /// Prepends an argument.
-        /// </summary>
-        /// <param name="argument">The argument.</param>
-        public void Prepend(IProcessArgument argument)
-        {
-            _tokens.Insert(0, argument);
-        }
+    /// <summary>
+    /// Renders the arguments as a <see cref="string"/>.
+    /// Sensitive information will be included.
+    /// </summary>
+    /// <returns>A string representation of the arguments.</returns>
+    public string Render()
+    {
+        return string.Join(" ", _tokens.Select(t => t.Render()));
+    }
 
-        /// <summary>
-        /// Renders the arguments as a <see cref="string"/>.
-        /// Sensitive information will be included.
-        /// </summary>
-        /// <returns>A string representation of the arguments.</returns>
-        public string Render()
-        {
-            return string.Join(" ", _tokens.Select(t => t.Render()));
-        }
+    /// <summary>
+    /// Renders the arguments as a <see cref="string"/>.
+    /// Sensitive information will be redacted.
+    /// </summary>
+    /// <returns>A safe string representation of the arguments.</returns>
+    public string RenderSafe()
+    {
+        return string.Join(" ", _tokens.Select(t => t.RenderSafe()));
+    }
 
-        /// <summary>
-        /// Renders the arguments as a <see cref="string"/>.
-        /// Sensitive information will be redacted.
-        /// </summary>
-        /// <returns>A safe string representation of the arguments.</returns>
-        public string RenderSafe()
+    /// <summary>
+    /// Tries to filer any unsafe arguments from string
+    /// </summary>
+    /// <param name="source">unsafe source string.</param>
+    /// <returns>Filtered string.</returns>
+    public string FilterUnsafe(string source)
+    {
+        if (string.IsNullOrWhiteSpace(source))
         {
-            return string.Join(" ", _tokens.Select(t => t.RenderSafe()));
+            return source;
         }
 
-        /// <summary>
-        /// Tries to filer any unsafe arguments from string
-        /// </summary>
-        /// <param name="source">unsafe source string.</param>
-        /// <returns>Filtered string.</returns>
-        public string FilterUnsafe(string source)
-        {
-            if (string.IsNullOrWhiteSpace(source))
+        return _tokens
+            .Select(token => new
             {
-                return source;
-            }
-
-            return _tokens
-                .Select(token => new
-                {
-                    Safe = token.RenderSafe().Trim('"').Trim(),
-                    Unsafe = token.Render().Trim('"').Trim()
-                })
-                .Where(token => token.Safe != token.Unsafe)
-                .Aggregate(
-                    new StringBuilder(source),
-                    (sb, token) => sb.Replace(token.Unsafe, token.Safe),
-                    sb => sb.ToString());
-        }
+                Safe = token.RenderSafe().Trim('"').Trim(),
+                Unsafe = token.Render().Trim('"').Trim()
+            })
+            .Where(token => token.Safe != token.Unsafe)
+            .Aggregate(
+                new StringBuilder(source),
+                (sb, token) => sb.Replace(token.Unsafe, token.Safe),
+                sb => sb.ToString());
+    }
 
-        /// <summary>
-        /// Performs an implicit conversion from <see cref="System.String"/> to <see cref="ProcessArgumentBuilder"/>.
-        /// </summary>
-        /// <param name="value">The text value to convert.</param>
-        /// <returns>A <see cref="FilePath"/>.</returns>
-        public static implicit operator ProcessArgumentBuilder(string value)
-        {
-            return FromString(value);
-        }
+    /// <summary>
+    /// Performs an implicit conversion from <see cref="System.String"/> to <see cref="ProcessArgumentBuilder"/>.
+    /// </summary>
+    /// <param name="value">The text value to convert.</param>
+    /// <returns>A <see cref="FilePath"/>.</returns>
+    public static implicit operator ProcessArgumentBuilder(string value)
+    {
+        return FromString(value);
+    }
 
-        /// <summary>
-        /// Performs a conversion from <see cref="System.String"/> to <see cref="ProcessArgumentBuilder"/>.
-        /// </summary>
-        /// <param name="value">The text value to convert.</param>
-        /// <returns>A <see cref="FilePath"/>.</returns>
-        public static ProcessArgumentBuilder FromString(string value)
-        {
-            var builder = new ProcessArgumentBuilder();
-            builder.Append(new TextArgument(value));
-            return builder;
-        }
+    /// <summary>
+    /// Performs a conversion from <see cref="System.String"/> to <see cref="ProcessArgumentBuilder"/>.
+    /// </summary>
+    /// <param name="value">The text value to convert.</param>
+    /// <returns>A <see cref="FilePath"/>.</returns>
+    public static ProcessArgumentBuilder FromString(string value)
+    {
+        var builder = new ProcessArgumentBuilder();
+        builder.Append(new TextArgument(value));
+        return builder;
+    }
 
-        /// <summary>
-        /// Returns an enumerator that iterates through the collection.
-        /// </summary>
-        /// <returns>
-        /// An enumerator that can be used to iterate through the collection.
-        /// </returns>
-        IEnumerator<IProcessArgument> IEnumerable<IProcessArgument>.GetEnumerator()
-        {
-            return _tokens.GetEnumerator();
-        }
+    /// <summary>
+    /// Returns an enumerator that iterates through the collection.
+    /// </summary>
+    /// <returns>
+    /// An enumerator that can be used to iterate through the collection.
+    /// </returns>
+    IEnumerator<IProcessArgument> IEnumerable<IProcessArgument>.GetEnumerator()
+    {
+        return _tokens.GetEnumerator();
+    }
 
-        /// <summary>
-        /// Returns an enumerator that iterates through a collection.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="T:System.Collections.IEnumerator" /> that can be used to iterate through the collection.
-        /// </returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return ((IEnumerable)_tokens).GetEnumerator();
-        }
+    /// <summary>
+    /// Returns an enumerator that iterates through a collection.
+    /// </summary>
+    /// <returns>
+    /// An <see cref="T:System.Collections.IEnumerator" /> that can be used to iterate through the collection.
+    /// </returns>
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return ((IEnumerable)_tokens).GetEnumerator();
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/ProcessHelper.cs b/src/LocalStack.AwsLocal/ProcessCore/ProcessHelper.cs
index 5d70e92..08d22ec 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/ProcessHelper.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/ProcessHelper.cs
@@ -7,18 +7,13 @@
 *
 ***************************************************************************************/
 
-using System;
-using System.Diagnostics;
-using System.Linq;
+namespace LocalStack.AwsLocal.ProcessCore;
 
-namespace LocalStack.AwsLocal.ProcessCore
+internal static class ProcessHelper
 {
-    internal static class ProcessHelper
+    public static void SetEnvironmentVariable(ProcessStartInfo info, string key, string value)
     {
-        public static void SetEnvironmentVariable(ProcessStartInfo info, string key, string value)
-        {
-            string envKey = info.Environment.Keys.FirstOrDefault(existingKey => StringComparer.OrdinalIgnoreCase.Equals(existingKey, key)) ?? key;
-            info.Environment[envKey] = value;
-        }
+        string envKey = info.Environment.Keys.FirstOrDefault(existingKey => StringComparer.OrdinalIgnoreCase.Equals(existingKey, key)) ?? key;
+        info.Environment[envKey] = value;
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/ProcessRunner.cs b/src/LocalStack.AwsLocal/ProcessCore/ProcessRunner.cs
index 9e32005..c9870f1 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/ProcessRunner.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/ProcessRunner.cs
@@ -1,119 +1,111 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using LocalStack.AwsLocal.Contracts;
-using LocalStack.AwsLocal.Extensions;
-using LocalStack.AwsLocal.ProcessCore.IO;
-
-namespace LocalStack.AwsLocal.ProcessCore
-{
+namespace LocalStack.AwsLocal.ProcessCore;
+
 /// <summary>
-    /// Responsible for starting processes.
+/// Responsible for starting processes.
+/// </summary>
+public sealed class ProcessRunner : IProcessRunner
+{
+    /// <summary>
+    /// Starts a process using the specified information.
     /// </summary>
-    public sealed class ProcessRunner : IProcessRunner
+    /// <param name="filePath">The file name such as an application or document with which to start the process.</param>
+    /// <param name="settings">The information about the process to start.</param>
+    /// <returns>A process handle.</returns>
+    public IProcess Start(FilePath filePath, ProcessSettings settings)
     {
-        /// <summary>
-        /// Starts a process using the specified information.
-        /// </summary>
-        /// <param name="filePath">The file name such as an application or document with which to start the process.</param>
-        /// <param name="settings">The information about the process to start.</param>
-        /// <returns>A process handle.</returns>
-        public IProcess? Start(FilePath filePath, ProcessSettings settings)
+        if (filePath == null)
+        {
+            throw new ArgumentNullException(nameof(filePath));
+        }
+        if (settings == null)
         {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-            if (settings == null)
-            {
-                throw new ArgumentNullException(nameof(settings));
-            }
-
-            ProcessStartInfo info = GetProcessStartInfo(filePath, settings, out Func<string, string> filterUnsafe);
-
-            // Start and return the process.
-            var process = Process.Start(info);
-            if (process == null)
-            {
-                return null;
-            }
-
-            var processWrapper = new ProcessWrapper(process, filterUnsafe, settings.RedirectedStandardOutputHandler,
-                filterUnsafe, settings.RedirectedStandardErrorHandler);
-
-            if (settings.RedirectStandardOutput)
-            {
-                SubscribeStandardOutput(process, processWrapper);
-            }
-            if (settings.RedirectStandardError)
-            {
-                SubscribeStandardError(process, processWrapper);
-            }
-
-            return processWrapper;
+            throw new ArgumentNullException(nameof(settings));
         }
 
-        internal ProcessStartInfo GetProcessStartInfo(FilePath filePath, ProcessSettings settings, out Func<string, string> filterUnsafe)
+        ProcessStartInfo info = GetProcessStartInfo(filePath, settings, out Func<string, string> filterUnsafe);
+
+        // Start and return the process.
+        var process = Process.Start(info);
+        if (process == null)
         {
-            // Get the fileName
-            var fileName = !RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? filePath.FullPath : filePath.FullPath.Quote();
-
-            // Get the arguments.
-            var arguments = settings.Arguments ?? new ProcessArgumentBuilder();
-            filterUnsafe = arguments.FilterUnsafe;
-
-            if (!settings.Silent)
-            {
-                // Log the filename and arguments.
-                var message = string.Concat(fileName, " ", arguments.RenderSafe().TrimEnd());
-                Console.WriteLine("Executing: {0}", message);
-            }
-
-            // Create the process start info.
-            var info = new ProcessStartInfo(fileName)
-            {
-                Arguments = arguments.Render(),
-                UseShellExecute = false,
-                RedirectStandardError = settings.RedirectStandardError,
-                RedirectStandardOutput = settings.RedirectStandardOutput
-            };
-
-            // Allow working directory?
-            if (!settings.NoWorkingDirectory)
-            {
-                DirectoryPath? workingDirectory = settings.WorkingDirectory;
-                info.WorkingDirectory = workingDirectory?.MakeAbsolute(workingDirectory).FullPath;
-            }
-
-            if (settings.EnvironmentVariables == null)
-            {
-                return info;
-            }
-
-            foreach ((string key, string value) in settings.EnvironmentVariables)
-            {
-                ProcessHelper.SetEnvironmentVariable(info, key, value);
-            }
+            return null;
+        }
 
-            return info;
+        var processWrapper = new ProcessWrapper(process, filterUnsafe, settings.RedirectedStandardOutputHandler,
+            filterUnsafe, settings.RedirectedStandardErrorHandler);
+
+        if (settings.RedirectStandardOutput)
+        {
+            SubscribeStandardOutput(process, processWrapper);
+        }
+        if (settings.RedirectStandardError)
+        {
+            SubscribeStandardError(process, processWrapper);
+        }
+
+        return processWrapper;
+    }
+
+    internal ProcessStartInfo GetProcessStartInfo(FilePath filePath, ProcessSettings settings, out Func<string, string> filterUnsafe)
+    {
+        // Get the fileName
+        var fileName = !RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? filePath.FullPath : filePath.FullPath.Quote();
+
+        // Get the arguments.
+        var arguments = settings.Arguments ?? new ProcessArgumentBuilder();
+        filterUnsafe = arguments.FilterUnsafe;
+
+        if (!settings.Silent)
+        {
+            // Log the filename and arguments.
+            var message = string.Concat(fileName, " ", arguments.RenderSafe().TrimEnd());
+            Console.WriteLine("Executing: {0}", message);
         }
 
-        private static void SubscribeStandardError(Process process, ProcessWrapper processWrapper)
+        // Create the process start info.
+        var info = new ProcessStartInfo(fileName)
         {
-            process.ErrorDataReceived += (s, e) =>
-            {
-                processWrapper.StandardErrorReceived(e.Data);
-            };
-            process.BeginErrorReadLine();
+            Arguments = arguments.Render(),
+            UseShellExecute = false,
+            RedirectStandardError = settings.RedirectStandardError,
+            RedirectStandardOutput = settings.RedirectStandardOutput
+        };
+
+        // Allow working directory?
+        if (!settings.NoWorkingDirectory)
+        {
+            DirectoryPath workingDirectory = settings.WorkingDirectory;
+            info.WorkingDirectory = workingDirectory?.MakeAbsolute(workingDirectory).FullPath;
         }
 
-        private static void SubscribeStandardOutput(Process process, ProcessWrapper processWrapper)
+        if (settings.EnvironmentVariables == null)
         {
-            process.OutputDataReceived += (s, e) =>
-            {
-                processWrapper.StandardOutputReceived(e.Data);
-            };
-            process.BeginOutputReadLine();
+            return info;
         }
+
+        foreach ((string key, string value) in settings.EnvironmentVariables)
+        {
+            ProcessHelper.SetEnvironmentVariable(info, key, value);
+        }
+
+        return info;
+    }
+
+    private static void SubscribeStandardError(Process process, ProcessWrapper processWrapper)
+    {
+        process.ErrorDataReceived += (s, e) =>
+        {
+            processWrapper.StandardErrorReceived(e.Data);
+        };
+        process.BeginErrorReadLine();
+    }
+
+    private static void SubscribeStandardOutput(Process process, ProcessWrapper processWrapper)
+    {
+        process.OutputDataReceived += (s, e) =>
+        {
+            processWrapper.StandardOutputReceived(e.Data);
+        };
+        process.BeginOutputReadLine();
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/ProcessSettings.cs b/src/LocalStack.AwsLocal/ProcessCore/ProcessSettings.cs
index f76a2b0..1943847 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/ProcessSettings.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/ProcessSettings.cs
@@ -7,84 +7,79 @@
 *
 ***************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using LocalStack.AwsLocal.ProcessCore.IO;
+namespace LocalStack.AwsLocal.ProcessCore;
 
-namespace LocalStack.AwsLocal.ProcessCore
+/// <summary>
+/// Specifies a set of values that are used to start a process.
+/// </summary>
+public sealed class ProcessSettings
 {
     /// <summary>
-    /// Specifies a set of values that are used to start a process.
+    /// Gets or sets the set of command-line arguments to use when starting the application.
     /// </summary>
-    public sealed class ProcessSettings
-    {
-        /// <summary>
-        /// Gets or sets the set of command-line arguments to use when starting the application.
-        /// </summary>
-        /// <value>The set of command-line arguments to use when starting the application.</value>
-        public ProcessArgumentBuilder? Arguments { get; set; }
+    /// <value>The set of command-line arguments to use when starting the application.</value>
+    public ProcessArgumentBuilder Arguments { get; set; }
 
-        /// <summary>
-        /// Gets or sets the working directory for the process to be started.
-        /// </summary>
-        /// <value>The working directory for the process to be started.</value>
-        public DirectoryPath? WorkingDirectory { get; set; }
+    /// <summary>
+    /// Gets or sets the working directory for the process to be started.
+    /// </summary>
+    /// <value>The working directory for the process to be started.</value>
+    public DirectoryPath WorkingDirectory { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether or not to opt out of using
-        /// an explicit working directory for the process.
-        /// </summary>
-        public bool NoWorkingDirectory { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether or not to opt out of using
+    /// an explicit working directory for the process.
+    /// </summary>
+    public bool NoWorkingDirectory { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the error output of an application is written to the standard error stream.
-        /// </summary>
-        /// <value>true if error output should be redirected; false if error output should be written to the standard error stream. The default is false.</value>
-        public bool RedirectStandardError { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether the error output of an application is written to the standard error stream.
+    /// </summary>
+    /// <value>true if error output should be redirected; false if error output should be written to the standard error stream. The default is false.</value>
+    public bool RedirectStandardError { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the output of an application is written to the standard output stream.
-        /// </summary>
-        /// <value>true if output should be redirected; false if output should be written to the standard output stream. The default is false.</value>
-        public bool RedirectStandardOutput { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether the output of an application is written to the standard output stream.
+    /// </summary>
+    /// <value>true if output should be redirected; false if output should be written to the standard output stream. The default is false.</value>
+    public bool RedirectStandardOutput { get; set; }
 
-        /// <summary>
-        /// Gets or sets a function that intercepts the error output before being redirected. Use in conjunction with <see cref="RedirectStandardError"/>
-        /// </summary>
-        public Func<string, string>? RedirectedStandardErrorHandler { get; set; }
+    /// <summary>
+    /// Gets or sets a function that intercepts the error output before being redirected. Use in conjunction with <see cref="RedirectStandardError"/>
+    /// </summary>
+    public Func<string, string> RedirectedStandardErrorHandler { get; set; }
 
-        /// <summary>
-        /// Gets or sets a function that intercepts the standard output before being redirected. Use in conjunction with <see cref="RedirectStandardOutput"/>
-        /// </summary>
-        public Func<string, string>? RedirectedStandardOutputHandler { get; set; }
+    /// <summary>
+    /// Gets or sets a function that intercepts the standard output before being redirected. Use in conjunction with <see cref="RedirectStandardOutput"/>
+    /// </summary>
+    public Func<string, string> RedirectedStandardOutputHandler { get; set; }
 
-        /// <summary>
-        /// Gets or sets optional timeout, in milliseconds, to wait for the associated process to exit. The maximum is the largest possible value of a 32-bit integer, which represents infinity to the operating system.
-        /// </summary>
-        public int? Timeout { get; set; }
+    /// <summary>
+    /// Gets or sets optional timeout, in milliseconds, to wait for the associated process to exit. The maximum is the largest possible value of a 32-bit integer, which represents infinity to the operating system.
+    /// </summary>
+    public int? Timeout { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether process output will be suppressed.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if process output will be suppressed; otherwise, <c>false</c>.
-        /// </value>
-        public bool Silent { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether process output will be suppressed.
+    /// </summary>
+    /// <value>
+    ///   <c>true</c> if process output will be suppressed; otherwise, <c>false</c>.
+    /// </value>
+    public bool Silent { get; set; }
 
-        /// <summary>
-        /// Gets or sets search paths for files, directories for temporary files, application-specific options, and other similar information.
-        /// </summary>
-        /// <example>
-        /// <code>
-        /// StartProcess("cmd", new ProcessSettings{
-        ///         Arguments = "/c set",
-        ///         EnvironmentVariables = new Dictionary&lt;string, string&gt;{
-        ///             { "CI", "True" },
-        ///             { "TEMP", MakeAbsolute(Directory("./Temp")).FullPath }
-        ///         }
-        ///     });
-        /// </code>
-        /// </example>
-        public IDictionary<string, string>? EnvironmentVariables { get; set; }
-    }
-}
+    /// <summary>
+    /// Gets or sets search paths for files, directories for temporary files, application-specific options, and other similar information.
+    /// </summary>
+    /// <example>
+    /// <code>
+    /// StartProcess("cmd", new ProcessSettings{
+    ///         Arguments = "/c set",
+    ///         EnvironmentVariables = new Dictionary&lt;string, string&gt;{
+    ///             { "CI", "True" },
+    ///             { "TEMP", MakeAbsolute(Directory("./Temp")).FullPath }
+    ///         }
+    ///     });
+    /// </code>
+    /// </example>
+    public IDictionary<string, string> EnvironmentVariables { get; set; }
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/ProcessCore/ProcessWrapper.cs b/src/LocalStack.AwsLocal/ProcessCore/ProcessWrapper.cs
index c80ac35..aca200f 100644
--- a/src/LocalStack.AwsLocal/ProcessCore/ProcessWrapper.cs
+++ b/src/LocalStack.AwsLocal/ProcessCore/ProcessWrapper.cs
@@ -7,120 +7,114 @@
 *
 ***************************************************************************************/
 
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using LocalStack.AwsLocal.Contracts;
+namespace LocalStack.AwsLocal.ProcessCore;
 
-namespace LocalStack.AwsLocal.ProcessCore
+internal sealed class ProcessWrapper : IProcess
 {
-    internal sealed class ProcessWrapper : IProcess
+    private readonly System.Diagnostics.Process _process;
+    private readonly Func<string, string> _filterError;
+    private readonly Func<string, string> _filterOutput;
+    private readonly ConcurrentQueue<string> _consoleErrorQueue;
+    private readonly ConcurrentQueue<string> _consoleOutputQueue;
+    private readonly Func<string, string> _standardOutputHandler;
+    private readonly Func<string, string> _standardErrorHandler;
+
+    public ProcessWrapper(System.Diagnostics.Process process, Func<string, string> filterOutput,
+        Func<string, string> standardOutputHandler,
+        Func<string, string> filterError, Func<string, string> standardErrorHandler)
     {
-        private readonly System.Diagnostics.Process _process;
-        private readonly Func<string, string> _filterError;
-        private readonly Func<string, string> _filterOutput;
-        private readonly ConcurrentQueue<string> _consoleErrorQueue;
-        private readonly ConcurrentQueue<string> _consoleOutputQueue;
-        private readonly Func<string, string> _standardOutputHandler;
-        private readonly Func<string, string> _standardErrorHandler;
-
-        public ProcessWrapper(System.Diagnostics.Process process, Func<string, string> filterOutput,
-            Func<string, string>? standardOutputHandler,
-            Func<string, string> filterError, Func<string, string>? standardErrorHandler)
+        _process = process;
+        _filterOutput = filterOutput ?? (source => "[REDACTED]");
+        _consoleOutputQueue = new ConcurrentQueue<string>();
+        _standardOutputHandler = standardOutputHandler ?? (output => output);
+        _filterError = filterError ?? (source => "[REDACTED]");
+        _consoleErrorQueue = new ConcurrentQueue<string>();
+        _standardErrorHandler = standardErrorHandler ?? (output => output);
+    }
+
+    public void WaitForExit()
+    {
+        _process.WaitForExit();
+    }
+
+    public bool WaitForExit(int milliseconds)
+    {
+        if (_process.WaitForExit(milliseconds))
         {
-            _process = process;
-            _filterOutput = filterOutput ?? (source => "[REDACTED]");
-            _consoleOutputQueue = new ConcurrentQueue<string>();
-            _standardOutputHandler = standardOutputHandler ?? (output => output);
-            _filterError = filterError ?? (source => "[REDACTED]");
-            _consoleErrorQueue = new ConcurrentQueue<string>();
-            _standardErrorHandler = standardErrorHandler ?? (output => output);
+            return true;
         }
 
-        public void WaitForExit()
+        _process.Refresh();
+        if (!_process.HasExited)
         {
-            _process.WaitForExit();
+            _process.Kill();
         }
 
-        public bool WaitForExit(int milliseconds)
-        {
-            if (_process.WaitForExit(milliseconds))
-            {
-                return true;
-            }
+        return false;
+    }
 
-            _process.Refresh();
-            if (!_process.HasExited)
-            {
-                _process.Kill();
-            }
+    public int GetExitCode()
+    {
+        return _process.ExitCode;
+    }
 
-            return false;
-        }
+    internal void StandardErrorReceived(string standardError)
+    {
+        string redirectedError = _standardErrorHandler(standardError);
 
-        public int GetExitCode()
+        if (redirectedError != null)
         {
-            return _process.ExitCode;
+            _consoleErrorQueue.Enqueue(redirectedError);
         }
+    }
 
-        internal void StandardErrorReceived(string standardError)
+    public IEnumerable<string> GetStandardError()
+    {
+        while (!_consoleErrorQueue.IsEmpty || !_process.HasExited)
         {
-            string redirectedError = _standardErrorHandler(standardError);
-
-            if (redirectedError != null)
+            if (!_consoleErrorQueue.TryDequeue(out string line))
             {
-                _consoleErrorQueue.Enqueue(redirectedError);
+                continue;
             }
-        }
-
-        public IEnumerable<string> GetStandardError()
-        {
-            while (!_consoleErrorQueue.IsEmpty || !_process.HasExited)
-            {
-                if (!_consoleErrorQueue.TryDequeue(out string line))
-                {
-                    continue;
-                }
 
-                Console.WriteLine("{0}", _filterError(line));
-                yield return line;
-            }
+            Console.WriteLine("{0}", _filterError(line));
+            yield return line;
         }
+    }
 
-        internal void StandardOutputReceived(string standardOutput)
-        {
-            string redirectedOutput = _standardOutputHandler(standardOutput);
+    internal void StandardOutputReceived(string standardOutput)
+    {
+        string redirectedOutput = _standardOutputHandler(standardOutput);
 
-            if (redirectedOutput != null)
-            {
-                _consoleOutputQueue.Enqueue(redirectedOutput);
-            }
+        if (redirectedOutput != null)
+        {
+            _consoleOutputQueue.Enqueue(redirectedOutput);
         }
+    }
 
-        public IEnumerable<string> GetStandardOutput()
+    public IEnumerable<string> GetStandardOutput()
+    {
+        while (!_consoleOutputQueue.IsEmpty || !_process.HasExited)
         {
-            while (!_consoleOutputQueue.IsEmpty || !_process.HasExited)
+            if (!_consoleOutputQueue.TryDequeue(out string line))
             {
-                if (!_consoleOutputQueue.TryDequeue(out string line))
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                Console.WriteLine("{0}", _filterOutput(line));
+            Console.WriteLine("{0}", _filterOutput(line));
 
-                yield return line;
-            }
+            yield return line;
         }
+    }
 
-        public void Kill()
-        {
-            _process.Kill();
-            _process.WaitForExit();
-        }
+    public void Kill()
+    {
+        _process.Kill();
+        _process.WaitForExit();
+    }
 
-        public void Dispose()
-        {
-            _process.Dispose();
-        }
+    public void Dispose()
+    {
+        _process.Dispose();
     }
-}
+}
\ No newline at end of file
diff --git a/src/LocalStack.AwsLocal/Program.cs b/src/LocalStack.AwsLocal/Program.cs
index 2fd5cc4..22e114a 100644
--- a/src/LocalStack.AwsLocal/Program.cs
+++ b/src/LocalStack.AwsLocal/Program.cs
@@ -1,42 +1,34 @@
-using LocalStack.Client;
-using System;
-using LocalStack.AwsLocal.ProcessCore;
-using LocalStack.AwsLocal.ProcessCore.IO;
-using LocalStack.Client.Models;
-using LocalStack.Client.Options;
+namespace LocalStack.AwsLocal;
 
-namespace LocalStack.AwsLocal
+internal static class Program
 {
-    internal static class Program
-    {
-        private static readonly string? LocalStackHost = Environment.GetEnvironmentVariable("LOCALSTACK_HOST");
-        private static readonly string? UseSsl = Environment.GetEnvironmentVariable("USE_SSL");
-        private static readonly string? UseLegacyPorts = Environment.GetEnvironmentVariable("USE_LEGACY_PORTS");
-        private static readonly string? UseEdgePort = Environment.GetEnvironmentVariable("EDGE_PORT");
+    private static readonly string LocalStackHost = Environment.GetEnvironmentVariable("LOCALSTACK_HOST");
+    private static readonly string UseSsl = Environment.GetEnvironmentVariable("USE_SSL");
+    private static readonly string UseLegacyPorts = Environment.GetEnvironmentVariable("USE_LEGACY_PORTS");
+    private static readonly string UseEdgePort = Environment.GetEnvironmentVariable("EDGE_PORT");
 
-        private static void Main(string[] args)
-        {
-            //Console.WriteLine("Waiting for debugger to attach");
-            //while (!Debugger.IsAttached)
-            //{
-            //    Thread.Sleep(100);
-            //}
-            //Console.WriteLine("Debugger attached");
+    private static void Main(string[] args)
+    {
+        //Console.WriteLine("Waiting for debugger to attach");
+        //while (!Debugger.IsAttached)
+        //{
+        //    Thread.Sleep(100);
+        //}
+        //Console.WriteLine("Debugger attached");
 
-            string localStackHost = !string.IsNullOrEmpty(LocalStackHost) ? LocalStackHost : Constants.LocalStackHost;
-            bool useSsl = !string.IsNullOrEmpty(UseSsl) && (UseSsl == "1" || UseSsl == "true");
-            bool useLegacyPorts = !string.IsNullOrEmpty(UseLegacyPorts) || (UseLegacyPorts == "1" || UseLegacyPorts == "true");
-            int edgePort = int.TryParse(UseEdgePort, out int port) ? port : Constants.EdgePort;
+        string localStackHost = !string.IsNullOrEmpty(LocalStackHost) ? LocalStackHost : Constants.LocalStackHost;
+        bool useSsl = !string.IsNullOrEmpty(UseSsl) && UseSsl is "1" or "true";
+        bool useLegacyPorts = !string.IsNullOrEmpty(UseLegacyPorts) || UseLegacyPorts is "1" or "true";
+        int edgePort = int.TryParse(UseEdgePort, out int port) ? port : Constants.EdgePort;
 
-            var configOptions = new ConfigOptions(localStackHost, useSsl, useLegacyPorts, edgePort);
+        var configOptions = new ConfigOptions(localStackHost, useSsl, useLegacyPorts, edgePort);
 
-            var processRunner = new ProcessRunner();
-            var config = new Config(configOptions);
-            var fileSystem = new FileSystem();
+        var processRunner = new ProcessRunner();
+        var config = new Config(configOptions);
+        var fileSystem = new FileSystem();
 
-            var commandDispatcher = new CommandDispatcher(processRunner, config, fileSystem, args);
+        var commandDispatcher = new CommandDispatcher(processRunner, config, fileSystem, args);
 
-            commandDispatcher.Run();
-        }
+        commandDispatcher.Run();
     }
 }
\ No newline at end of file
diff --git a/src/LocalStack.sln b/src/LocalStack.sln
index bc2b15c..27d3e60 100644
--- a/src/LocalStack.sln
+++ b/src/LocalStack.sln
@@ -1,14 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.452
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LocalStack.AwsLocal", "LocalStack.AwsLocal\LocalStack.AwsLocal.csproj", "{D5116356-24F8-4B01-AB33-64CCFC5F0713}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D9F1CEF9-248C-49EA-BD93-5B5E6FD02967}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LocalStack.AwsLocal.Tests", "..\tests\LocalStack.AwsLocal.Tests\LocalStack.AwsLocal.Tests.csproj", "{1109B4DD-BD82-4759-981B-6EB1D474A200}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{924DBE7D-09A6-4948-B616-3FA2025D5F94}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -28,7 +28,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{1109B4DD-BD82-4759-981B-6EB1D474A200} = {D9F1CEF9-248C-49EA-BD93-5B5E6FD02967}
+		{1109B4DD-BD82-4759-981B-6EB1D474A200} = {924DBE7D-09A6-4948-B616-3FA2025D5F94}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {479893D2-EC31-4B10-8F7C-DDA704071C4D}
diff --git a/tests/LocalStack.AwsLocal.Tests/ArgumentExtensionsTests.cs b/tests/LocalStack.AwsLocal.Tests/ArgumentExtensionsTests.cs
index cec75e9..b905ed9 100644
--- a/tests/LocalStack.AwsLocal.Tests/ArgumentExtensionsTests.cs
+++ b/tests/LocalStack.AwsLocal.Tests/ArgumentExtensionsTests.cs
@@ -1,83 +1,78 @@
-using System.Linq;
-using LocalStack.AwsLocal.Extensions;
-using Xunit;
+namespace LocalStack.AwsLocal.Tests;
 
-namespace LocalStack.AwsLocal.Tests
+public class ArgumentExtensionsTests
 {
-    public class ArgumentExtensionsTests
+    [Fact]
+    public void ExtractServiceName_Should_Return_Empty_String_If_Arguments_Contains_Dash()
     {
-        [Fact]
-        public void ExtractServiceName_Should_Return_Empty_String_If_Arguments_Contains_Dash()
-        {
-            var args = new[] {"-foo", "-bar"};
+        var args = new[] {"-foo", "-bar"};
 
-            string serviceName = args.ExtractServiceName();
+        string serviceName = args.ExtractServiceName();
 
-            Assert.Equal(string.Empty, serviceName);
-        }
+        Assert.Equal(string.Empty, serviceName);
+    }
 
-        [Fact]
-        public void ExtractServiceName_Should_Return_S3_If_One_Of_The_Argument_Is_S3Api()
-        {
-            var args = new[] { "-foo", "-bar", "s3api" };
+    [Fact]
+    public void ExtractServiceName_Should_Return_S3_If_One_Of_The_Argument_Is_S3Api()
+    {
+        var args = new[] { "-foo", "-bar", "s3api" };
 
-            string serviceName = args.ExtractServiceName();
+        string serviceName = args.ExtractServiceName();
 
-            Assert.Equal("s3", serviceName);
-        }
+        Assert.Equal("s3", serviceName);
+    }
 
-        [Fact]
-        public void ExtractServiceName_Should_Extract_First_Valid_Argument_As_ServiceName_From_Arguments()
-        {
-            var args = new[] { "-foo", "-bar", "kinesis", "list-streams" };
+    [Fact]
+    public void ExtractServiceName_Should_Extract_First_Valid_Argument_As_ServiceName_From_Arguments()
+    {
+        var args = new[] { "-foo", "-bar", "kinesis", "list-streams" };
 
-            string serviceName = args.ExtractServiceName();
+        string serviceName = args.ExtractServiceName();
 
-            Assert.Equal("kinesis", serviceName);
-        }
+        Assert.Equal("kinesis", serviceName);
+    }
 
-        [Fact]
-        public void GetCliCommand_Should_Add_LocalStack_Service_EndPoint_As_Endpoint_Switch_To_Command()
-        {
-            var args = new[] { "kinesis", "list-streams" };
-            const string serviceUrl = "http://localhost:1234";
+    [Fact]
+    public void GetCliCommand_Should_Add_LocalStack_Service_EndPoint_As_Endpoint_Switch_To_Command()
+    {
+        var args = new[] { "kinesis", "list-streams" };
+        const string serviceUrl = "http://localhost:1234";
 
-            string cliCommand = args.GetCliCommand(serviceUrl);
+        string cliCommand = args.GetCliCommand(serviceUrl);
 
-            Assert.Contains($"--endpoint-url={serviceUrl}", cliCommand);
-        }
+        Assert.Contains($"--endpoint-url={serviceUrl}", cliCommand);
+    }
 
-        [Fact]
-        public void GetCliCommand_Should_Add_No_Verify_Ssl_Switch_To_Command()
-        {
-            var args = new[] { "kinesis", "list-streams" };
-            const string serviceUrl = "https://localhost:1234";
+    [Fact]
+    public void GetCliCommand_Should_Add_No_Verify_Ssl_Switch_To_Command()
+    {
+        var args = new[] { "kinesis", "list-streams" };
+        const string serviceUrl = "https://localhost:1234";
 
-            string cliCommand = args.GetCliCommand(serviceUrl);
+        string cliCommand = args.GetCliCommand(serviceUrl);
 
-            Assert.Contains("--no-verify-ssl", cliCommand);
-        }
+        Assert.Contains("--no-verify-ssl", cliCommand);
+    }
 
-        [Fact]
-        public void GetCliCommand_Should_Add_Aws_To_Command_As_First_Argument()
-        {
-            var args = new[] { "kinesis", "list-streams" };
-            const string serviceUrl = "http://localhost:1234";
+    [Fact]
+    public void GetCliCommand_Should_Add_Aws_To_Command_As_First_Argument()
+    {
+        var args = new[] { "kinesis", "list-streams" };
+        const string serviceUrl = "http://localhost:1234";
 
-            string cliCommand = args.GetCliCommand(serviceUrl);
+        string cliCommand = args.GetCliCommand(serviceUrl);
 
-            Assert.StartsWith("aws ", cliCommand);
-        }
+        Assert.StartsWith("aws ", cliCommand);
+    }
 
-        [Fact]
-        public void GetCliCommand_Should_Add_Arguments_To_Command()
-        {
-            var args = new[] { "-foo", "-bar", "kinesis", "list-streams" };
-            const string serviceUrl = "http://localhost:1234";
+    [Fact]
+    public void GetCliCommand_Should_Add_Arguments_To_Command()
+    {
+        var args = new[] { "-foo", "-bar", "kinesis", "list-streams" };
+        const string serviceUrl = "http://localhost:1234";
 
-            string cliCommand = args.GetCliCommand(serviceUrl);
+        string cliCommand = args.GetCliCommand(serviceUrl);
 
-            Assert.Contains(args, s => cliCommand.Split(" ").Contains(s));
-        }
+        Assert.Contains(args, s => cliCommand.Split(" ").Contains(s));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LocalStack.AwsLocal.Tests/CommandDispatcherTests.cs b/tests/LocalStack.AwsLocal.Tests/CommandDispatcherTests.cs
index 9922b1e..38fd2f8 100644
--- a/tests/LocalStack.AwsLocal.Tests/CommandDispatcherTests.cs
+++ b/tests/LocalStack.AwsLocal.Tests/CommandDispatcherTests.cs
@@ -1,130 +1,120 @@
-using System.Collections.Generic;
-using LocalStack.AwsLocal.AmbientContexts;
-using LocalStack.AwsLocal.Extensions;
-using LocalStack.AwsLocal.Tests.Mocks;
-using LocalStack.Client.Enums;
-using LocalStack.Client.Models;
-using Moq;
-using Xunit;
-
-namespace LocalStack.AwsLocal.Tests
+namespace LocalStack.AwsLocal.Tests;
+
+public class CommandDispatcherTests
 {
-    public class CommandDispatcherTests
+    private readonly EnvironmentContextMock _environmentContextMock;
+    private readonly ConsoleContextMock _consoleContextMock;
+
+    public CommandDispatcherTests()
+    {
+        _environmentContextMock = new EnvironmentContextMock();
+        _consoleContextMock = new ConsoleContextMock();
+
+        EnvironmentContext.Current = _environmentContextMock;
+        ConsoleContext.Current = _consoleContextMock;
+    }
+
+    [Fact]
+    public void Run_Should_Write_Help_Info_And_Exit_With_Zero_If_Argument_Count_Zero()
+    {
+        CommandDispatcherMock commandDispatcher = CommandDispatcherMock.Create(Array.Empty<string>());
+
+        commandDispatcher.Run();
+
+        Assert.Equal(0, _environmentContextMock.ExitValue);
+        Assert.NotNull(_consoleContextMock.Text);
+        Assert.NotEmpty(_consoleContextMock.Text);
+    }
+
+    [Fact]
+    public void Run_Should_Write_Help_Info_And_Exit_With_Zero_If_The_First_Argument_Is_Help()
+    {
+        CommandDispatcherMock commandDispatcher = CommandDispatcherMock.Create(new[] {"-h"});
+
+        commandDispatcher.Run();
+
+        Assert.Equal(0, _environmentContextMock.ExitValue);
+        Assert.NotNull(_consoleContextMock.Text);
+        Assert.NotEmpty(_consoleContextMock.Text);
+    }
+
+    [Fact]
+    public void Run_Should_Write_Error_And_Exit_With_One_If_The_Arguments_Does_Not_Contains_Valid_ServiceName()
     {
-        private readonly EnvironmentContextMock _environmentContextMock;
-        private readonly ConsoleContextMock _consoleContextMock;
-
-        public CommandDispatcherTests()
-        {
-            _environmentContextMock = new EnvironmentContextMock();
-            _consoleContextMock = new ConsoleContextMock();
-
-            EnvironmentContext.Current = _environmentContextMock;
-            ConsoleContext.Current = _consoleContextMock;
-        }
-
-        [Fact]
-        public void Run_Should_Write_Help_Info_And_Exit_With_Zero_If_Argument_Count_Zero()
-        {
-            CommandDispatcherMock commandDispatcher = CommandDispatcherMock.Create(new string[0]);
-
-            commandDispatcher.Run();
-
-            Assert.Equal(0, _environmentContextMock.ExitValue);
-            Assert.NotNull(_consoleContextMock.Text);
-            Assert.NotEmpty(_consoleContextMock.Text);
-        }
-
-        [Fact]
-        public void Run_Should_Write_Help_Info_And_Exit_With_Zero_If_The_First_Argument_Is_Help()
-        {
-            CommandDispatcherMock commandDispatcher = CommandDispatcherMock.Create(new[] {"-h"});
-
-            commandDispatcher.Run();
-
-            Assert.Equal(0, _environmentContextMock.ExitValue);
-            Assert.NotNull(_consoleContextMock.Text);
-            Assert.NotEmpty(_consoleContextMock.Text);
-        }
-
-        [Fact]
-        public void Run_Should_Write_Error_And_Exit_With_One_If_The_Arguments_Does_Not_Contains_Valid_ServiceName()
-        {
-            CommandDispatcherMock commandDispatcher = CommandDispatcherMock.Create(new[] { "-foo -bar" });
-
-            commandDispatcher.Run();
-
-            Assert.Equal(1, _environmentContextMock.ExitValue);
-            Assert.NotNull(_consoleContextMock.Text);
-            Assert.NotEmpty(_consoleContextMock.Text);
-            Assert.StartsWith("ERROR:", _consoleContextMock.Text);
-        }
-
-        [Fact]
-        public void Run_Should_Write_Error_And_Exit_With_One_If_Given_ServiceName_Has_Not_Valid_LocalStack_Endpoint()
-        {
-            CommandDispatcherMock commandDispatcher = CommandDispatcherMock.Create(new[] { "hinesis", "list-streams" });
-
-            commandDispatcher.Config
-                .Setup(config => config.GetAwsServiceEndpoints())
-                .Returns(() => new List<AwsServiceEndpoint>());
-
-            commandDispatcher.Run();
-
-            Assert.Equal(1, _environmentContextMock.ExitValue);
-            Assert.NotNull(_consoleContextMock.Text);
-            Assert.NotEmpty(_consoleContextMock.Text);
-            Assert.StartsWith("ERROR:", _consoleContextMock.Text);
-
-            commandDispatcher.Config
-                .Verify(config => config.GetAwsServiceEndpoints(), Times.Once);
-        }
-
-        //[Fact]
-        //public void Run_Should_Run_Aws_Command_With_Generated_Command_And_Aws_Credentials()
-        //{
-        //    var args = new[] {"kinesis", "list-streams"};
-
-        //    AwsServiceEndpointMetadata endpointMetadata = AwsServiceEndpointMetadata.Kinesis;
-        //    var awsServiceEndpoint = new AwsServiceEndpoint(
-        //        endpointMetadata.ServiceId,
-        //        endpointMetadata.CliName,
-        //        endpointMetadata.Enum,
-        //        endpointMetadata.Port,
-        //        "localhost",
-        //        endpointMetadata.ToString("http", "localhost"));
-
-        //    string cliCommand = args.GetCliCommand(awsServiceEndpoint.ServiceUrl);
-
-        //    CommandDispatcherMock commandDispatcher = CommandDispatcherMock.Create(args);
-
-        //    commandDispatcher.Config
-        //        .Setup(config => config.GetAwsServiceEndpoints())
-        //        .Returns(() => new[] {awsServiceEndpoint});
-
-        //    commandDispatcher.ProcessRunner.Setup(runner => runner.)
-
-        //    commandDispatcher.ProcessRunner
-        //        .Setup(helper => helper.CmdExecute(
-        //            It.IsAny<string>(),
-        //            It.IsAny<string>(),
-        //            It.IsAny<bool>(),
-        //            It.IsAny<bool>(),
-        //            It.IsAny<Dictionary<string, string>>()))
-        //        .Returns(0);
-
-        //    commandDispatcher.Run();
-
-        //    commandDispatcher.Config
-        //        .Verify(config => config.GetAwsServiceEndpoints(), Times.Once);
-
-        //    commandDispatcher.ProcessRunner
-        //        .Verify(helper => helper.CmdExecute(
-        //            It.Is<string>(s => s == cliCommand),
-        //            It.Is<string>(s => s == null),
-        //            It.Is<bool>(b => b),
-        //            It.Is<bool>(b => b),
-        //            It.IsAny<Dictionary<string, string>>()), Times.Once);
-        //}
+        CommandDispatcherMock commandDispatcher = CommandDispatcherMock.Create(new[] { "-foo -bar" });
+
+        commandDispatcher.Run();
+
+        Assert.Equal(1, _environmentContextMock.ExitValue);
+        Assert.NotNull(_consoleContextMock.Text);
+        Assert.NotEmpty(_consoleContextMock.Text);
+        Assert.StartsWith("ERROR:", _consoleContextMock.Text);
     }
-}
+
+    [Fact]
+    public void Run_Should_Write_Error_And_Exit_With_One_If_Given_ServiceName_Has_Not_Valid_LocalStack_Endpoint()
+    {
+        CommandDispatcherMock commandDispatcher = CommandDispatcherMock.Create(new[] { "hinesis", "list-streams" });
+
+        commandDispatcher.Config
+            .Setup(config => config.GetAwsServiceEndpoints())
+            .Returns(() => new List<AwsServiceEndpoint>());
+
+        commandDispatcher.Run();
+
+        Assert.Equal(1, _environmentContextMock.ExitValue);
+        Assert.NotNull(_consoleContextMock.Text);
+        Assert.NotEmpty(_consoleContextMock.Text);
+        Assert.StartsWith("ERROR:", _consoleContextMock.Text);
+
+        commandDispatcher.Config
+            .Verify(config => config.GetAwsServiceEndpoints(), Times.Once);
+    }
+
+    //[Fact]
+    //public void Run_Should_Run_Aws_Command_With_Generated_Command_And_Aws_Credentials()
+    //{
+    //    var args = new[] {"kinesis", "list-streams"};
+
+    //    AwsServiceEndpointMetadata endpointMetadata = AwsServiceEndpointMetadata.Kinesis;
+    //    var awsServiceEndpoint = new AwsServiceEndpoint(
+    //        endpointMetadata.ServiceId,
+    //        endpointMetadata.CliName,
+    //        endpointMetadata.Enum,
+    //        endpointMetadata.Port,
+    //        "localhost",
+    //        endpointMetadata.ToString("http", "localhost"));
+
+    //    string cliCommand = args.GetCliCommand(awsServiceEndpoint.ServiceUrl);
+
+    //    CommandDispatcherMock commandDispatcher = CommandDispatcherMock.Create(args);
+
+    //    commandDispatcher.Config
+    //        .Setup(config => config.GetAwsServiceEndpoints())
+    //        .Returns(() => new[] {awsServiceEndpoint});
+
+    //    commandDispatcher.ProcessRunner.Setup(runner => runner.)
+
+    //    commandDispatcher.ProcessRunner
+    //        .Setup(helper => helper.CmdExecute(
+    //            It.IsAny<string>(),
+    //            It.IsAny<string>(),
+    //            It.IsAny<bool>(),
+    //            It.IsAny<bool>(),
+    //            It.IsAny<Dictionary<string, string>>()))
+    //        .Returns(0);
+
+    //    commandDispatcher.Run();
+
+    //    commandDispatcher.Config
+    //        .Verify(config => config.GetAwsServiceEndpoints(), Times.Once);
+
+    //    commandDispatcher.ProcessRunner
+    //        .Verify(helper => helper.CmdExecute(
+    //            It.Is<string>(s => s == cliCommand),
+    //            It.Is<string>(s => s == null),
+    //            It.Is<bool>(b => b),
+    //            It.Is<bool>(b => b),
+    //            It.IsAny<Dictionary<string, string>>()), Times.Once);
+    //}
+}
\ No newline at end of file
diff --git a/tests/LocalStack.AwsLocal.Tests/GlobalUsings.cs b/tests/LocalStack.AwsLocal.Tests/GlobalUsings.cs
new file mode 100644
index 0000000..dd5bb1c
--- /dev/null
+++ b/tests/LocalStack.AwsLocal.Tests/GlobalUsings.cs
@@ -0,0 +1,14 @@
+global using LocalStack.AwsLocal.AmbientContexts;
+global using LocalStack.AwsLocal.Contracts;
+global using LocalStack.AwsLocal.Extensions;
+global using LocalStack.AwsLocal.Tests.Mocks;
+global using LocalStack.Client.Contracts;
+global using LocalStack.Client.Models;
+
+global using Moq;
+
+global using System;
+global using System.Collections.Generic;
+global using System.Linq;
+
+global using Xunit;
\ No newline at end of file
diff --git a/tests/LocalStack.AwsLocal.Tests/Mocks/CommandDispatcherMock.cs b/tests/LocalStack.AwsLocal.Tests/Mocks/CommandDispatcherMock.cs
index 7bc2349..17aad3b 100644
--- a/tests/LocalStack.AwsLocal.Tests/Mocks/CommandDispatcherMock.cs
+++ b/tests/LocalStack.AwsLocal.Tests/Mocks/CommandDispatcherMock.cs
@@ -1,31 +1,26 @@
-using LocalStack.AwsLocal.Contracts;
-using LocalStack.Client.Contracts;
-using Moq;
+namespace LocalStack.AwsLocal.Tests.Mocks;
 
-namespace LocalStack.AwsLocal.Tests.Mocks
+public class CommandDispatcherMock : CommandDispatcher
 {
-    public class CommandDispatcherMock : CommandDispatcher
+    public CommandDispatcherMock(Mock<IProcessRunner> processRunner, Mock<IConfig> config, Mock<IFileSystem> fileSystem, string[] args) 
+        : base(processRunner.Object, config.Object, fileSystem.Object, args)
     {
-        public CommandDispatcherMock(Mock<IProcessRunner> processRunner, Mock<IConfig> config, Mock<IFileSystem> fileSystem, string[] args) 
-            : base(processRunner.Object, config.Object, fileSystem.Object, args)
-        {
-            ProcessRunner = processRunner;
-            Config = config;
-        }
+        ProcessRunner = processRunner;
+        Config = config;
+    }
 
-        public Mock<IProcessRunner> ProcessRunner { get; }
+    public Mock<IProcessRunner> ProcessRunner { get; }
 
-        public Mock<IConfig> Config { get; }
+    public Mock<IConfig> Config { get; }
 
-        public Mock<IFileSystem> FileSystem { get; }
+    public Mock<IFileSystem> FileSystem { get; }
 
-        public static CommandDispatcherMock Create(string[] args)
-        {
-            return new CommandDispatcherMock(
-                new Mock<IProcessRunner>(MockBehavior.Strict),
-                new Mock<IConfig>(MockBehavior.Strict),
-                new Mock<IFileSystem>(MockBehavior.Strict), 
-                args);
-        }
+    public static CommandDispatcherMock Create(string[] args)
+    {
+        return new CommandDispatcherMock(
+            new Mock<IProcessRunner>(MockBehavior.Strict),
+            new Mock<IConfig>(MockBehavior.Strict),
+            new Mock<IFileSystem>(MockBehavior.Strict), 
+            args);
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LocalStack.AwsLocal.Tests/Mocks/ConsoleContextMock.cs b/tests/LocalStack.AwsLocal.Tests/Mocks/ConsoleContextMock.cs
index 8254c49..a3c29e3 100644
--- a/tests/LocalStack.AwsLocal.Tests/Mocks/ConsoleContextMock.cs
+++ b/tests/LocalStack.AwsLocal.Tests/Mocks/ConsoleContextMock.cs
@@ -1,16 +1,13 @@
-using LocalStack.AwsLocal.AmbientContexts;
+namespace LocalStack.AwsLocal.Tests.Mocks;
 
-namespace LocalStack.AwsLocal.Tests.Mocks
+public class ConsoleContextMock : ConsoleContext
 {
-    public class ConsoleContextMock : ConsoleContext
-    {
-        private string _text;
-
-        public override void WriteLine(string text)
-        {
-            _text = text;
-        }
+    private string _text;
 
-        public string Text => _text;
+    public override void WriteLine(string text)
+    {
+        _text = text;
     }
-}
+
+    public string Text => _text;
+}
\ No newline at end of file
diff --git a/tests/LocalStack.AwsLocal.Tests/Mocks/EnvironmentContextMock.cs b/tests/LocalStack.AwsLocal.Tests/Mocks/EnvironmentContextMock.cs
index 990ff8f..0833df5 100644
--- a/tests/LocalStack.AwsLocal.Tests/Mocks/EnvironmentContextMock.cs
+++ b/tests/LocalStack.AwsLocal.Tests/Mocks/EnvironmentContextMock.cs
@@ -1,16 +1,13 @@
-using LocalStack.AwsLocal.AmbientContexts;
+namespace LocalStack.AwsLocal.Tests.Mocks;
 
-namespace LocalStack.AwsLocal.Tests.Mocks
+public class EnvironmentContextMock : EnvironmentContext
 {
-    public class EnvironmentContextMock : EnvironmentContext
-    {
-        private int _exitValue;
-
-        public override void Exit(int value)
-        {
-            _exitValue = value;
-        }
+    private int _exitValue;
 
-        public int ExitValue => _exitValue;
+    public override void Exit(int value)
+    {
+        _exitValue = value;
     }
-}
+
+    public int ExitValue => _exitValue;
+}
\ No newline at end of file