Updated version

Fix for proxy when not using DI
Docs
2026-08-12 17:03:10 +00:00 · 2023-07-23 13:52:07 +02:00 · 2023-07-23 10:01:13 +02:00 · 2023-07-11 21:38:48 +02:00 · 2023-07-05 21:58:35 +02:00 · 2023-07-05 17:10:43 +02:00
95 changed files with 4666 additions and 4153 deletions
@@ -11,66 +11,6 @@ namespace CryptoExchange.Net.UnitTests
    [TestFixture()]
    public class BaseClientTests
    {
-        [TestCase]
-        public void SettingLogOutput_Should_RedirectLogOutput()
-        {
-            // arrange
-            var logger = new TestStringLogger();
-            var client = new TestBaseClient(new BaseRestClientOptions()
-            {
-                LogWriters = new List<ILogger> { logger }
-            });
-
-            // act
-            client.Log(LogLevel.Information, "Test");
-
-            // assert
-            Assert.IsFalse(string.IsNullOrEmpty(logger.GetLogs()));
-        }
-
-        [TestCase(LogLevel.None, LogLevel.Error, false)]
-        [TestCase(LogLevel.None, LogLevel.Warning, false)]
-        [TestCase(LogLevel.None, LogLevel.Information, false)]
-        [TestCase(LogLevel.None, LogLevel.Debug, false)]
-        [TestCase(LogLevel.Error, LogLevel.Error, true)]
-        [TestCase(LogLevel.Error, LogLevel.Warning, false)]
-        [TestCase(LogLevel.Error, LogLevel.Information, false)]
-        [TestCase(LogLevel.Error, LogLevel.Debug, false)]
-        [TestCase(LogLevel.Warning, LogLevel.Error, true)]
-        [TestCase(LogLevel.Warning, LogLevel.Warning, true)]
-        [TestCase(LogLevel.Warning, LogLevel.Information, false)]
-        [TestCase(LogLevel.Warning, LogLevel.Debug, false)]
-        [TestCase(LogLevel.Information, LogLevel.Error, true)]
-        [TestCase(LogLevel.Information, LogLevel.Warning, true)]
-        [TestCase(LogLevel.Information, LogLevel.Information, true)]
-        [TestCase(LogLevel.Information, LogLevel.Debug, false)]
-        [TestCase(LogLevel.Debug, LogLevel.Error, true)]
-        [TestCase(LogLevel.Debug, LogLevel.Warning, true)]
-        [TestCase(LogLevel.Debug, LogLevel.Information, true)]
-        [TestCase(LogLevel.Debug, LogLevel.Debug, true)]
-        [TestCase(null, LogLevel.Error, true)]
-        [TestCase(null, LogLevel.Warning, true)]
-        [TestCase(null, LogLevel.Information, true)]
-        [TestCase(null, LogLevel.Debug, false)]
-        public void SettingLogLevel_Should_RestrictLogging(LogLevel? verbosity, LogLevel testVerbosity, bool expected)
-        {
-            // arrange
-            var logger = new TestStringLogger();
-            var options = new BaseRestClientOptions()
-            {
-                LogWriters = new List<ILogger> { logger }
-            };
-            if (verbosity != null)
-                options.LogLevel = verbosity.Value;
-            var client = new TestBaseClient(options);
-
-            // act
-            client.Log(testVerbosity, "Test");
-
-            // assert
-            Assert.AreEqual(!string.IsNullOrEmpty(logger.GetLogs()), expected);
-        }
-
        [TestCase]
        public void DeserializingValidJson_Should_GiveSuccessfulResult()
        {
@@ -78,7 +18,7 @@ namespace CryptoExchange.Net.UnitTests
            var client = new TestBaseClient();

            // act
-            var result = client.Deserialize<object>("{\"testProperty\": 123}");
+            var result = client.SubClient.Deserialize<object>("{\"testProperty\": 123}");

            // assert
            Assert.IsTrue(result.Success);
@@ -91,7 +31,7 @@ namespace CryptoExchange.Net.UnitTests
            var client = new TestBaseClient();

            // act
-            var result = client.Deserialize<object>("{\"testProperty\": 123");
+            var result = client.SubClient.Deserialize<object>("{\"testProperty\": 123");

            // assert
            Assert.IsFalse(result.Success);
@@ -113,6 +113,7 @@ namespace CryptoExchange.Net.UnitTests
                System.Net.HttpStatusCode.OK,
                new List<KeyValuePair<string, IEnumerable<string>>>(),
                TimeSpan.FromSeconds(1),
+                null,
                "{}",
                "https://test.com/api",
                null,
@@ -140,6 +141,7 @@ namespace CryptoExchange.Net.UnitTests
                System.Net.HttpStatusCode.OK,
                new List<KeyValuePair<string, IEnumerable<string>>>(),
                TimeSpan.FromSeconds(1),
+                null,
                "{}",
                "https://test.com/api",
                null,
@@ -6,10 +6,10 @@
  </PropertyGroup>

  <ItemGroup>
-    <packagereference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211130-02"></packagereference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211130-02"></PackageReference>
    <PackageReference Include="Moq" Version="4.16.1" />
-    <packagereference Include="NUnit" Version="3.13.2"></packagereference>
-    <packagereference Include="NUnit3TestAdapter" Version="4.2.0"></packagereference>
+    <PackageReference Include="NUnit" Version="3.13.2"></PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.0"></PackageReference>
  </ItemGroup>

  <ItemGroup>
@@ -1,5 +1,6 @@
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.UnitTests.TestImplementations;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
@@ -34,7 +35,7 @@ namespace CryptoExchange.Net.UnitTests
            // act
            // assert
            Assert.Throws(typeof(ArgumentException),
-                () => new RestApiClientOptions() { ApiCredentials = new ApiCredentials(key, secret) });
+                () => new RestExchangeOptions<TestEnvironment, ApiCredentials>() { ApiCredentials = new ApiCredentials(key, secret) });
        }

        [Test]
@@ -57,239 +58,96 @@ namespace CryptoExchange.Net.UnitTests
        public void TestApiOptionsAreSet()
        {
            // arrange, act
-            var options = new TestClientOptions
-            {
-                Api1Options = new RestApiClientOptions
-                {
-                    ApiCredentials = new ApiCredentials("123", "456"),
-                    BaseAddress = "http://test1.com"
-                },
-                Api2Options = new RestApiClientOptions
-                {
-                    ApiCredentials = new ApiCredentials("789", "101"),
-                    BaseAddress = "http://test2.com"
-                }
-            };
+            var options = new TestClientOptions();
+            options.Api1Options.ApiCredentials = new ApiCredentials("123", "456");
+            options.Api2Options.ApiCredentials = new ApiCredentials("789", "101");

            // assert
            Assert.AreEqual(options.Api1Options.ApiCredentials.Key.GetString(), "123");
            Assert.AreEqual(options.Api1Options.ApiCredentials.Secret.GetString(), "456");
-            Assert.AreEqual(options.Api1Options.BaseAddress, "http://test1.com");
            Assert.AreEqual(options.Api2Options.ApiCredentials.Key.GetString(), "789");
            Assert.AreEqual(options.Api2Options.ApiCredentials.Secret.GetString(), "101");
-            Assert.AreEqual(options.Api2Options.BaseAddress, "http://test2.com");
-        }
-
-        [Test]
-        public void TestNotOverridenApiOptionsAreStillDefault()
-        {
-            // arrange, act
-            var options = new TestClientOptions
-            {
-                Api1Options = new RestApiClientOptions
-                {
-                    ApiCredentials = new ApiCredentials("123", "456"),
-                }
-            };
-
-            // assert
-            Assert.AreEqual(options.Api1Options.RateLimitingBehaviour, RateLimitingBehaviour.Wait);
-            Assert.AreEqual(options.Api1Options.BaseAddress, "https://api1.test.com/");
-            Assert.AreEqual(options.Api2Options.BaseAddress, "https://api2.test.com/");
-        }
-
-        [Test]
-        public void TestSettingDefaultBaseOptionsAreRespected()
-        {
-            // arrange
-            TestClientOptions.Default = new TestClientOptions
-            {
-                ApiCredentials = new ApiCredentials("123", "456"),
-                LogLevel = LogLevel.Trace
-            };
-
-            // act
-            var options = new TestClientOptions();
-
-            // assert
-            Assert.AreEqual(options.LogLevel, LogLevel.Trace);
-            Assert.AreEqual(options.ApiCredentials.Key.GetString(), "123");
-            Assert.AreEqual(options.ApiCredentials.Secret.GetString(), "456");
-        }
-
-        [Test]
-        public void TestSettingDefaultApiOptionsAreRespected()
-        {
-            // arrange
-            TestClientOptions.Default = new TestClientOptions
-            {
-                ApiCredentials = new ApiCredentials("123", "456"),
-                LogLevel = LogLevel.Trace,
-                Api1Options = new RestApiClientOptions
-                {
-                    ApiCredentials = new ApiCredentials("456", "789")
-                }
-            };
-
-            // act
-            var options = new TestClientOptions();
-
-            // assert
-            Assert.AreEqual(options.ApiCredentials.Key.GetString(), "123");
-            Assert.AreEqual(options.ApiCredentials.Secret.GetString(), "456");
-            Assert.AreEqual(options.Api1Options.BaseAddress, "https://api1.test.com/");
-            Assert.AreEqual(options.Api1Options.ApiCredentials.Key.GetString(), "456");
-            Assert.AreEqual(options.Api1Options.ApiCredentials.Secret.GetString(), "789");
-        }
-
-        [Test]
-        public void TestSettingDefaultApiOptionsWithSomeOverriddenAreRespected()
-        {
-            // arrange
-            TestClientOptions.Default = new TestClientOptions
-            {
-                ApiCredentials = new ApiCredentials("123", "456"),
-                LogLevel = LogLevel.Trace,
-                Api1Options = new RestApiClientOptions
-                {
-                    ApiCredentials = new ApiCredentials("456", "789")
-                },
-                Api2Options = new RestApiClientOptions
-                {
-                    ApiCredentials = new ApiCredentials("111", "222")
-                }
-            };
-
-            // act
-            var options = new TestClientOptions
-            {
-                Api1Options = new RestApiClientOptions
-                {
-                    ApiCredentials = new ApiCredentials("333", "444")
-                }
-            };
-
-            // assert
-            Assert.AreEqual(options.ApiCredentials.Key.GetString(), "123");
-            Assert.AreEqual(options.ApiCredentials.Secret.GetString(), "456");
-            Assert.AreEqual(options.Api1Options.ApiCredentials.Key.GetString(), "333");
-            Assert.AreEqual(options.Api1Options.ApiCredentials.Secret.GetString(), "444");
-            Assert.AreEqual(options.Api2Options.ApiCredentials.Key.GetString(), "111");
-            Assert.AreEqual(options.Api2Options.ApiCredentials.Secret.GetString(), "222");
        }

        [Test]
        public void TestClientUsesCorrectOptions()
        {
-            var client = new TestRestClient(new TestClientOptions()
-            {
-                ApiCredentials = new ApiCredentials("123", "456"),
-                Api1Options = new RestApiClientOptions
-                {
-                    ApiCredentials = new ApiCredentials("111", "222")
-                }
+            var client = new TestRestClient(options => {
+                options.Api1Options.ApiCredentials = new ApiCredentials("111", "222");
+                options.ApiCredentials = new ApiCredentials("333", "444");
            });

-            Assert.AreEqual(client.Api1.AuthenticationProvider.Credentials.Key.GetString(), "111");
-            Assert.AreEqual(client.Api1.AuthenticationProvider.Credentials.Secret.GetString(), "222");
-            Assert.AreEqual(client.Api2.AuthenticationProvider.Credentials.Key.GetString(), "123");
-            Assert.AreEqual(client.Api2.AuthenticationProvider.Credentials.Secret.GetString(), "456");
+            var authProvider1 = (TestAuthProvider)client.Api1.AuthenticationProvider;
+            var authProvider2 = (TestAuthProvider)client.Api2.AuthenticationProvider;
+            Assert.AreEqual(authProvider1.GetKey(), "111");
+            Assert.AreEqual(authProvider1.GetSecret(), "222");
+            Assert.AreEqual(authProvider2.GetKey(), "333");
+            Assert.AreEqual(authProvider2.GetSecret(), "444");
        }

        [Test]
        public void TestClientUsesCorrectOptionsWithDefault()
        {
-            TestClientOptions.Default = new TestClientOptions()
-            {
-                ApiCredentials = new ApiCredentials("123", "456"),
-                Api1Options = new RestApiClientOptions
-                {
-                    ApiCredentials = new ApiCredentials("111", "222")
-                }
-            };
+            TestClientOptions.Default.ApiCredentials = new ApiCredentials("123", "456");
+            TestClientOptions.Default.Api1Options.ApiCredentials = new ApiCredentials("111", "222");

            var client = new TestRestClient();

-            Assert.AreEqual(client.Api1.AuthenticationProvider.Credentials.Key.GetString(), "111");
-            Assert.AreEqual(client.Api1.AuthenticationProvider.Credentials.Secret.GetString(), "222");
-            Assert.AreEqual(client.Api2.AuthenticationProvider.Credentials.Key.GetString(), "123");
-            Assert.AreEqual(client.Api2.AuthenticationProvider.Credentials.Secret.GetString(), "456");
+            var authProvider1 = (TestAuthProvider)client.Api1.AuthenticationProvider;
+            var authProvider2 = (TestAuthProvider)client.Api2.AuthenticationProvider;
+            Assert.AreEqual(authProvider1.GetKey(), "111");
+            Assert.AreEqual(authProvider1.GetSecret(), "222");
+            Assert.AreEqual(authProvider2.GetKey(), "123");
+            Assert.AreEqual(authProvider2.GetSecret(), "456");
        }

        [Test]
        public void TestClientUsesCorrectOptionsWithOverridingDefault()
        {
-            TestClientOptions.Default = new TestClientOptions()
-            {
-                ApiCredentials = new ApiCredentials("123", "456"),
-                Api1Options = new RestApiClientOptions
-                {
-                    ApiCredentials = new ApiCredentials("111", "222")
-                }
-            };
+            TestClientOptions.Default.ApiCredentials = new ApiCredentials("123", "456");
+            TestClientOptions.Default.Api1Options.ApiCredentials = new ApiCredentials("111", "222");

-            var client = new TestRestClient(new TestClientOptions
+            var client = new TestRestClient(options =>
            {
-                Api1Options = new RestApiClientOptions
-                {
-                    ApiCredentials = new ApiCredentials("333", "444")
-                },
-                Api2Options = new RestApiClientOptions()
-                {
-                    BaseAddress = "http://test.com"
-                }
+                options.Api1Options.ApiCredentials = new ApiCredentials("333", "444");
+                options.Environment = new TestEnvironment("Test", "https://test.test");
            });

-            Assert.AreEqual(client.Api1.AuthenticationProvider.Credentials.Key.GetString(), "333");
-            Assert.AreEqual(client.Api1.AuthenticationProvider.Credentials.Secret.GetString(), "444");
-            Assert.AreEqual(client.Api2.AuthenticationProvider.Credentials.Key.GetString(), "123");
-            Assert.AreEqual(client.Api2.AuthenticationProvider.Credentials.Secret.GetString(), "456");
-            Assert.AreEqual(client.Api2.BaseAddress, "http://test.com");
+            var authProvider1 = (TestAuthProvider)client.Api1.AuthenticationProvider;
+            var authProvider2 = (TestAuthProvider)client.Api2.AuthenticationProvider;
+            Assert.AreEqual(authProvider1.GetKey(), "333");
+            Assert.AreEqual(authProvider1.GetSecret(), "444");
+            Assert.AreEqual(authProvider2.GetKey(), "123");
+            Assert.AreEqual(authProvider2.GetSecret(), "456");
+            Assert.AreEqual(client.Api2.BaseAddress, "https://localhost:123");
        }
    }

-    public class TestClientOptions: BaseRestClientOptions
+    public class TestClientOptions: RestExchangeOptions<TestEnvironment, ApiCredentials>
    {
        /// <summary>
        /// Default options for the futures client
        /// </summary>
-        public static TestClientOptions Default { get; set; } = new TestClientOptions();
+        public static TestClientOptions Default { get; set; } = new TestClientOptions()
+        {
+            Environment = new TestEnvironment("test", "https://test.com")
+        };

        /// <summary>
        /// The default receive window for requests
        /// </summary>
        public TimeSpan ReceiveWindow { get; set; } = TimeSpan.FromSeconds(5);

-        private RestApiClientOptions _api1Options = new RestApiClientOptions("https://api1.test.com/");
-        public RestApiClientOptions Api1Options
+        public RestApiOptions Api1Options { get; private set; } = new RestApiOptions();
+
+        public RestApiOptions Api2Options { get; set; } = new RestApiOptions();
+
+        internal TestClientOptions Copy()
        {
-            get => _api1Options;
-            set => _api1Options = new RestApiClientOptions(_api1Options, value);
-        }
-
-        private RestApiClientOptions _api2Options = new RestApiClientOptions("https://api2.test.com/");
-        public RestApiClientOptions Api2Options
-        {
-            get => _api2Options;
-            set => _api2Options = new RestApiClientOptions(_api2Options, value);
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public TestClientOptions(): this(Default)
-        {
-        }
-
-        public TestClientOptions(TestClientOptions baseOn): base(baseOn)
-        {
-            if (baseOn == null)
-                return;
-
-            ReceiveWindow = baseOn.ReceiveWindow;
-
-            Api1Options = new RestApiClientOptions(baseOn.Api1Options, null);
-            Api2Options = new RestApiClientOptions(baseOn.Api2Options, null);
+            var options = Copy<TestClientOptions>();
+            options.Api1Options = Api1Options.Copy<RestApiOptions>();
+            options.Api2Options = Api2Options.Copy<RestApiOptions>();
+            return options;
        }
    }
 }
@@ -11,7 +11,6 @@ using CryptoExchange.Net.Interfaces;
 using Microsoft.Extensions.Logging;
 using System.Net.Http;
 using System.Threading.Tasks;
-using CryptoExchange.Net.Logging;
 using System.Threading;

 namespace CryptoExchange.Net.UnitTests
@@ -28,7 +27,7 @@ namespace CryptoExchange.Net.UnitTests
            client.SetResponse(JsonConvert.SerializeObject(expected), out _);

            // act
-            var result = client.Request<TestObject>().Result;
+            var result = client.Api1.Request<TestObject>().Result;

            // assert
            Assert.IsTrue(result.Success);
@@ -43,7 +42,7 @@ namespace CryptoExchange.Net.UnitTests
            client.SetResponse("{\"property\": 123", out _);

            // act
-            var result = client.Request<TestObject>().Result;
+            var result = client.Api1.Request<TestObject>().Result;

            // assert
            Assert.IsFalse(result.Success);
@@ -58,7 +57,7 @@ namespace CryptoExchange.Net.UnitTests
            client.SetErrorWithoutResponse(System.Net.HttpStatusCode.BadRequest, "Invalid request");

            // act
-            var result = await client.Request<TestObject>();
+            var result = await client.Api1.Request<TestObject>();

            // assert
            Assert.IsFalse(result.Success);
@@ -73,7 +72,7 @@ namespace CryptoExchange.Net.UnitTests
            client.SetErrorWithResponse("{\"errorMessage\": \"Invalid request\", \"errorCode\": 123}", System.Net.HttpStatusCode.BadRequest);

            // act
-            var result = await client.Request<TestObject>();
+            var result = await client.Api1.Request<TestObject>();

            // assert
            Assert.IsFalse(result.Success);
@@ -91,7 +90,7 @@ namespace CryptoExchange.Net.UnitTests
            client.SetErrorWithResponse("{\"errorMessage\": \"Invalid request\", \"errorCode\": 123}", System.Net.HttpStatusCode.BadRequest);

            // act
-            var result = await client.Request<TestObject>();
+            var result = await client.Api2.Request<TestObject>();

            // assert
            Assert.IsFalse(result.Success);
@@ -106,23 +105,16 @@ namespace CryptoExchange.Net.UnitTests
        {
            // arrange
            // act
-            var client = new TestRestClient(new TestClientOptions()
-            {
-                Api1Options = new RestApiClientOptions
-                {
-                    BaseAddress = "http://test.address.com",
-                    RateLimiters = new List<IRateLimiter> { new RateLimiter() },
-                    RateLimitingBehaviour = RateLimitingBehaviour.Fail
-                },
-                RequestTimeout = TimeSpan.FromMinutes(1)
-            });
-
+            var options = new TestClientOptions();
+            options.Api1Options.RateLimiters = new List<IRateLimiter> { new RateLimiter() };
+            options.Api1Options.RateLimitingBehaviour = RateLimitingBehaviour.Fail;
+            options.RequestTimeout = TimeSpan.FromMinutes(1);
+            var client = new TestBaseClient(options);

            // assert
-            Assert.IsTrue(((TestClientOptions)client.ClientOptions).Api1Options.BaseAddress == "http://test.address.com");
            Assert.IsTrue(((TestClientOptions)client.ClientOptions).Api1Options.RateLimiters.Count == 1);
            Assert.IsTrue(((TestClientOptions)client.ClientOptions).Api1Options.RateLimitingBehaviour == RateLimitingBehaviour.Fail);
-            Assert.IsTrue(client.ClientOptions.RequestTimeout == TimeSpan.FromMinutes(1));
+            Assert.IsTrue(((TestClientOptions)client.ClientOptions).RequestTimeout == TimeSpan.FromMinutes(1));
        }

        [TestCase("GET", HttpMethodParameterPosition.InUri)] // No need to test InBody for GET since thats not valid
@@ -136,19 +128,13 @@ namespace CryptoExchange.Net.UnitTests
        {
            // arrange
            // act
-            var client = new TestRestClient(new TestClientOptions()
-            {
-                Api1Options = new RestApiClientOptions
-                {
-                    BaseAddress = "http://test.address.com"
-                }
-            });
+            var client = new TestRestClient();

            client.Api1.SetParameterPosition(new HttpMethod(method), pos);

            client.SetResponse("{}", out var request);

-            await client.RequestWithParams<TestObject>(new HttpMethod(method), new Dictionary<string, object>
+            await client.Api1.RequestWithParams<TestObject>(new HttpMethod(method), new Dictionary<string, object>
            {
                { "TestParam1", "Value1" },
                { "TestParam2", 2 },
@@ -175,20 +161,17 @@ namespace CryptoExchange.Net.UnitTests
        [TestCase(1, 2)]
        public async Task PartialEndpointRateLimiterBasics(int requests, double perSeconds)
        {
-            var log = new Log("Test");
-            log.Level = LogLevel.Trace;
-
            var rateLimiter = new RateLimiter();
            rateLimiter.AddPartialEndpointLimit("/sapi/", requests, TimeSpan.FromSeconds(perSeconds));

            for (var i = 0; i < requests + 1; i++)
            {
-                var result1 = await rateLimiter.LimitRequestAsync(log, "/sapi/v1/system/status", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);             
+                var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), "/sapi/v1/system/status", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);             
                Assert.IsTrue(i == requests? result1.Data > 1 : result1.Data == 0);
            }

            await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
-            var result2 = await rateLimiter.LimitRequestAsync(log, "/sapi/v1/system/status", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+            var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), "/sapi/v1/system/status", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
            Assert.IsTrue(result2.Data == 0);
        }

@@ -199,15 +182,12 @@ namespace CryptoExchange.Net.UnitTests
        [TestCase("/sapi/", true)]
        public async Task PartialEndpointRateLimiterEndpoints(string endpoint, bool expectLimiting)
        {
-            var log = new Log("Test");
-            log.Level = LogLevel.Trace;
-
            var rateLimiter = new RateLimiter();
            rateLimiter.AddPartialEndpointLimit("/sapi/", 1, TimeSpan.FromSeconds(0.1));

            for (var i = 0; i < 2; i++)
            {
-                var result1 = await rateLimiter.LimitRequestAsync(log, endpoint, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+                var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
                bool expected = i == 1 ? (expectLimiting ? result1.Data > 1 : result1.Data == 0) : result1.Data == 0; 
                Assert.IsTrue(expected);
            }
@@ -218,14 +198,11 @@ namespace CryptoExchange.Net.UnitTests
        [TestCase("/sapi/test", "/sapi/", false)]
        public async Task PartialEndpointRateLimiterEndpoints(string endpoint1, string endpoint2, bool expectLimiting)
        {
-            var log = new Log("Test");
-            log.Level = LogLevel.Trace;
-
            var rateLimiter = new RateLimiter();
            rateLimiter.AddPartialEndpointLimit("/sapi/", 1, TimeSpan.FromSeconds(0.1), countPerEndpoint: true);

-            var result1 = await rateLimiter.LimitRequestAsync(log, endpoint1, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
-            var result2 = await rateLimiter.LimitRequestAsync(log, endpoint2, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+            var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint1, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+            var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint2, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
            Assert.IsTrue(result1.Data == 0);            
            Assert.IsTrue(expectLimiting ? result2.Data > 0 : result2.Data == 0);            
        }
@@ -236,20 +213,17 @@ namespace CryptoExchange.Net.UnitTests
        [TestCase(1, 2)]
        public async Task EndpointRateLimiterBasics(int requests, double perSeconds)
        {
-            var log = new Log("Test");
-            log.Level = LogLevel.Trace;
-
            var rateLimiter = new RateLimiter();
            rateLimiter.AddEndpointLimit("/sapi/test", requests, TimeSpan.FromSeconds(perSeconds));

            for (var i = 0; i < requests + 1; i++)
            {
-                var result1 = await rateLimiter.LimitRequestAsync(log, "/sapi/test", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+                var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), "/sapi/test", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
                Assert.IsTrue(i == requests ? result1.Data > 1 : result1.Data == 0);
            }

            await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
-            var result2 = await rateLimiter.LimitRequestAsync(log, "/sapi/test", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+            var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), "/sapi/test", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
            Assert.IsTrue(result2.Data == 0);
        }

@@ -258,15 +232,12 @@ namespace CryptoExchange.Net.UnitTests
        [TestCase("/sapi/test/123", false)]
        public async Task EndpointRateLimiterEndpoints(string endpoint, bool expectLimited)
        {
-            var log = new Log("Test");
-            log.Level = LogLevel.Trace;
-
            var rateLimiter = new RateLimiter();
            rateLimiter.AddEndpointLimit("/sapi/test", 1, TimeSpan.FromSeconds(0.1));

            for (var i = 0; i < 2; i++)
            {
-                var result1 = await rateLimiter.LimitRequestAsync(log, endpoint, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+                var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
                bool expected = i == 1 ? (expectLimited ? result1.Data > 1 : result1.Data == 0) : result1.Data == 0; 
                Assert.IsTrue(expected);
            }
@@ -278,15 +249,12 @@ namespace CryptoExchange.Net.UnitTests
        [TestCase("/sapi/test23", false)]
        public async Task EndpointRateLimiterMultipleEndpoints(string endpoint, bool expectLimited)
        {
-            var log = new Log("Test");
-            log.Level = LogLevel.Trace;
-
            var rateLimiter = new RateLimiter();
            rateLimiter.AddEndpointLimit(new[] { "/sapi/test", "/sapi/test2" }, 1, TimeSpan.FromSeconds(0.1));

            for (var i = 0; i < 2; i++)
            {
-                var result1 = await rateLimiter.LimitRequestAsync(log, endpoint, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+                var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
                bool expected = i == 1 ? (expectLimited ? result1.Data > 1 : result1.Data == 0) : result1.Data == 0;
                Assert.IsTrue(expected);
            }
@@ -315,14 +283,11 @@ namespace CryptoExchange.Net.UnitTests
        [TestCase(null, null, "/sapi/test", "/sapi/test", false, false, false, true)]
        public async Task ApiKeyRateLimiterBasics(string key1, string key2, string endpoint1, string endpoint2, bool signed1, bool signed2, bool onlyForSignedRequests, bool expectLimited)
        {
-            var log = new Log("Test");
-            log.Level = LogLevel.Trace;
-
            var rateLimiter = new RateLimiter();
            rateLimiter.AddApiKeyLimit(1, TimeSpan.FromSeconds(0.1), onlyForSignedRequests, false);

-            var result1 = await rateLimiter.LimitRequestAsync(log, endpoint1, HttpMethod.Get, signed1, key1?.ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
-            var result2 = await rateLimiter.LimitRequestAsync(log, endpoint2, HttpMethod.Get, signed2, key2?.ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+            var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint1, HttpMethod.Get, signed1, key1?.ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+            var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint2, HttpMethod.Get, signed2, key2?.ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
            Assert.IsTrue(result1.Data == 0);
            Assert.IsTrue(expectLimited ? result2.Data > 0 : result2.Data == 0);            
        }
@@ -332,14 +297,11 @@ namespace CryptoExchange.Net.UnitTests
        [TestCase("/", "/sapi/test2", true)]
        public async Task TotalRateLimiterBasics(string endpoint1, string endpoint2, bool expectLimited)
        {
-            var log = new Log("Test");
-            log.Level = LogLevel.Trace;
-
            var rateLimiter = new RateLimiter();
            rateLimiter.AddTotalRateLimit(1, TimeSpan.FromSeconds(0.1));

-            var result1 = await rateLimiter.LimitRequestAsync(log, endpoint1, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
-            var result2 = await rateLimiter.LimitRequestAsync(log, endpoint2, HttpMethod.Get, true, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+            var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint1, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+            var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint2, HttpMethod.Get, true, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
            Assert.IsTrue(result1.Data == 0);
            Assert.IsTrue(expectLimited ? result2.Data > 0 : result2.Data == 0);
        }
@@ -350,15 +312,12 @@ namespace CryptoExchange.Net.UnitTests
        [TestCase("/sapi/test", true, true, false, true)]
        public async Task ApiKeyRateLimiterIgnores_TotalRateLimiter_IfSet(string endpoint, bool signed1, bool signed2, bool ignoreTotal, bool expectLimited)
        {
-            var log = new Log("Test");
-            log.Level = LogLevel.Trace;
-
            var rateLimiter = new RateLimiter();
            rateLimiter.AddApiKeyLimit(100, TimeSpan.FromSeconds(0.1), true, ignoreTotal);
            rateLimiter.AddTotalRateLimit(1, TimeSpan.FromSeconds(0.1));

-            var result1 = await rateLimiter.LimitRequestAsync(log, endpoint, HttpMethod.Get, signed1, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
-            var result2 = await rateLimiter.LimitRequestAsync(log, endpoint, HttpMethod.Get, signed2, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+            var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint, HttpMethod.Get, signed1, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
+            var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint, HttpMethod.Get, signed2, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
            Assert.IsTrue(result1.Data == 0);
            Assert.IsTrue(expectLimited ? result2.Data > 0 : result2.Data == 0);
        }
@@ -17,19 +17,16 @@ namespace CryptoExchange.Net.UnitTests
        {
            //arrange
            //act
-            var client = new TestSocketClient(new TestOptions()
+            var client = new TestSocketClient(options =>
            {
-                SubOptions = new RestApiClientOptions
-                {
-                    BaseAddress = "http://test.address.com"
-                },
-                ReconnectInterval = TimeSpan.FromSeconds(6)
+                options.SubOptions.ApiCredentials = new Authentication.ApiCredentials("1", "2");
+                options.SubOptions.MaxSocketConnections = 1;
            });


            //assert
-            Assert.IsTrue(client.SubClient.Options.BaseAddress == "http://test.address.com");
-            Assert.IsTrue(client.ClientOptions.ReconnectInterval.TotalSeconds == 6);
+            Assert.NotNull(client.SubClient.ApiOptions.ApiCredentials);
+            Assert.AreEqual(1, client.SubClient.ApiOptions.MaxSocketConnections);
        }

        [TestCase(true)]
@@ -42,7 +39,7 @@ namespace CryptoExchange.Net.UnitTests
            socket.CanConnect = canConnect;

            //act
-            var connectResult = client.ConnectSocketSub(new SocketConnection(client, null, socket));
+            var connectResult = client.SubClient.ConnectSocketSub(new SocketConnection(new TraceLogger(), client.SubClient, socket, null));

            //assert
            Assert.IsTrue(connectResult.Success == canConnect);
@@ -52,20 +49,22 @@ namespace CryptoExchange.Net.UnitTests
        public void SocketMessages_Should_BeProcessedInDataHandlers()
        {
            // arrange
-            var client = new TestSocketClient(new TestOptions() { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug });
+            var client = new TestSocketClient(options => {
+                options.ReconnectInterval = TimeSpan.Zero;
+            });
            var socket = client.CreateSocket();
            socket.ShouldReconnect = true;
            socket.CanConnect = true;
            socket.DisconnectTime = DateTime.UtcNow;
-            var sub = new SocketConnection(client, null, socket);
+            var sub = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);
            var rstEvent = new ManualResetEvent(false);
            JToken result = null;
-            sub.AddSubscription(SocketSubscription.CreateForIdentifier(10, "TestHandler", true, (messageEvent) =>
+            sub.AddSubscription(SocketSubscription.CreateForIdentifier(10, "TestHandler", true, false, (messageEvent) =>
            {
                result = messageEvent.JsonData;
                rstEvent.Set();
            }));
-            client.ConnectSocketSub(sub);
+            client.SubClient.ConnectSocketSub(sub);

            // act
            socket.InvokeMessage("{\"property\": 123}");
@@ -80,20 +79,23 @@ namespace CryptoExchange.Net.UnitTests
        public void SocketMessages_Should_ContainOriginalDataIfEnabled(bool enabled)
        {
            // arrange
-            var client = new TestSocketClient(new TestOptions() { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug, OutputOriginalData = enabled });
+            var client = new TestSocketClient(options => {
+                options.ReconnectInterval = TimeSpan.Zero;
+                options.SubOptions.OutputOriginalData = enabled;
+            });
            var socket = client.CreateSocket();
            socket.ShouldReconnect = true;
            socket.CanConnect = true;
            socket.DisconnectTime = DateTime.UtcNow;
-            var sub = new SocketConnection(client, null, socket);
+            var sub = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);
            var rstEvent = new ManualResetEvent(false);
            string original = null;
-            sub.AddSubscription(SocketSubscription.CreateForIdentifier(10, "TestHandler", true, (messageEvent) =>
+            sub.AddSubscription(SocketSubscription.CreateForIdentifier(10, "TestHandler", true, false, (messageEvent) =>
            {
                original = messageEvent.OriginalData;
                rstEvent.Set();
            }));
-            client.ConnectSocketSub(sub);
+            client.SubClient.ConnectSocketSub(sub);

            // act
            socket.InvokeMessage("{\"property\": 123}");
@@ -103,44 +105,20 @@ namespace CryptoExchange.Net.UnitTests
            Assert.IsTrue(original == (enabled ? "{\"property\": 123}" : null));
        }

-        [TestCase]
-        public void DisconnectedSocket_Should_Reconnect()
-        {
-            // arrange
-            bool reconnected = false;
-            var client = new TestSocketClient(new TestOptions() { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug });
-            var socket = client.CreateSocket();
-            socket.ShouldReconnect = true;
-            socket.CanConnect = true;
-            socket.DisconnectTime = DateTime.UtcNow;
-            var sub = new SocketConnection(client, null, socket);
-            sub.ShouldReconnect = true;
-            client.ConnectSocketSub(sub);
-            var rstEvent = new ManualResetEvent(false);
-            sub.ConnectionRestored += (a) =>
-            {
-                reconnected = true;
-                rstEvent.Set();
-            };
-
-            // act
-            socket.InvokeClose();
-            rstEvent.WaitOne(1000);
-
-            // assert
-            Assert.IsTrue(reconnected);
-        }
-
        [TestCase()]
        public void UnsubscribingStream_Should_CloseTheSocket()
        {
            // arrange
-            var client = new TestSocketClient(new TestOptions() { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug });
+            var client = new TestSocketClient(options => {
+                options.ReconnectInterval = TimeSpan.Zero;
+            }); 
            var socket = client.CreateSocket();
            socket.CanConnect = true;
-            var sub = new SocketConnection(client, null, socket);
-            client.ConnectSocketSub(sub);
-            var ups = new UpdateSubscription(sub, SocketSubscription.CreateForIdentifier(10, "Test", true, (e) => {}));
+            var sub = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);
+            client.SubClient.ConnectSocketSub(sub);
+            var us = SocketSubscription.CreateForIdentifier(10, "Test", true, false, (e) => { });
+            var ups = new UpdateSubscription(sub, us);
+            sub.AddSubscription(us);

            // act
            client.UnsubscribeAsync(ups).Wait();
@@ -153,15 +131,15 @@ namespace CryptoExchange.Net.UnitTests
        public void UnsubscribingAll_Should_CloseAllSockets()
        {
            // arrange
-            var client = new TestSocketClient(new TestOptions() { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug });
+            var client = new TestSocketClient(options => { options.ReconnectInterval = TimeSpan.Zero; });
            var socket1 = client.CreateSocket();
            var socket2 = client.CreateSocket();
            socket1.CanConnect = true;
            socket2.CanConnect = true;
-            var sub1 = new SocketConnection(client, null, socket1);
-            var sub2 = new SocketConnection(client, null, socket2);
-            client.ConnectSocketSub(sub1);
-            client.ConnectSocketSub(sub2);
+            var sub1 = new SocketConnection(new TraceLogger(), client.SubClient, socket1, null);
+            var sub2 = new SocketConnection(new TraceLogger(), client.SubClient, socket2, null);
+            client.SubClient.ConnectSocketSub(sub1);
+            client.SubClient.ConnectSocketSub(sub2);

            // act
            client.UnsubscribeAllAsync().Wait();
@@ -175,13 +153,13 @@ namespace CryptoExchange.Net.UnitTests
        public void FailingToConnectSocket_Should_ReturnError()
        {
            // arrange
-            var client = new TestSocketClient(new TestOptions() { ReconnectInterval = TimeSpan.Zero, LogLevel = LogLevel.Debug });
+            var client = new TestSocketClient(options => { options.ReconnectInterval = TimeSpan.Zero; });
            var socket = client.CreateSocket();
            socket.CanConnect = false;
-            var sub = new SocketConnection(client, null, socket);
+            var sub1 = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);

            // act
-            var connectResult = client.ConnectSocketSub(sub);
+            var connectResult = client.SubClient.ConnectSocketSub(sub1);

            // assert
            Assert.IsFalse(connectResult.Success);
@@ -4,6 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.OrderBook;
 using CryptoExchange.Net.Sockets;
 using NUnit.Framework;
@@ -17,8 +18,9 @@ namespace CryptoExchange.Net.UnitTests

        private class TestableSymbolOrderBook : SymbolOrderBook
        {
-            public TestableSymbolOrderBook() : base("Test", "BTC/USD", defaultOrderBookOptions)
+            public TestableSymbolOrderBook() : base(null, "Test", "BTC/USD")
            {
+                Initialize(defaultOrderBookOptions);
            }


@@ -35,12 +37,12 @@ namespace CryptoExchange.Net.UnitTests
            public void SetData(IEnumerable<ISymbolOrderBookEntry> bids, IEnumerable<ISymbolOrderBookEntry> asks)
            {
                Status = OrderBookStatus.Synced;
-                base.bids.Clear();
+                base._bids.Clear();
                foreach (var bid in bids)
-                    base.bids.Add(bid.Price, bid);
-                base.asks.Clear();
+                    base._bids.Add(bid.Price, bid);
+                base._asks.Clear();
                foreach (var ask in asks)
-                    base.asks.Add(ask.Price, ask);
+                    base._asks.Add(ask.Price, ask);
            }
        }

@@ -108,5 +110,33 @@ namespace CryptoExchange.Net.UnitTests
            Assert.AreEqual(1.06666667m, resultBids2.Data);
            Assert.AreEqual(1.23333333m, resultAsks2.Data);
        }
+
+        [TestCase]
+        public void CalculateTradableAmount()
+        {
+            var orderbook = new TestableSymbolOrderBook();
+            orderbook.SetData(new List<ISymbolOrderBookEntry>
+            {
+                new BookEntry{ Price = 1, Quantity = 1 },
+                new BookEntry{ Price = 1.1m, Quantity = 1 },
+            },
+            new List<ISymbolOrderBookEntry>()
+            {
+                new BookEntry{ Price = 1.2m, Quantity = 1 },
+                new BookEntry{ Price = 1.3m, Quantity = 1 },
+            });
+
+            var resultBids = orderbook.CalculateTradableAmount(2, OrderBookEntryType.Bid);
+            var resultAsks = orderbook.CalculateTradableAmount(2, OrderBookEntryType.Ask);
+            var resultBids2 = orderbook.CalculateTradableAmount(1.5m, OrderBookEntryType.Bid);
+            var resultAsks2 = orderbook.CalculateTradableAmount(1.5m, OrderBookEntryType.Ask);
+
+            Assert.True(resultBids.Success);
+            Assert.True(resultAsks.Success);
+            Assert.AreEqual(1.9m, resultBids.Data);
+            Assert.AreEqual(1.61538462m, resultAsks.Data);
+            Assert.AreEqual(1.4m, resultBids2.Data);
+            Assert.AreEqual(1.23076923m, resultAsks2.Data);
+        }
    }
 }
@@ -1,31 +1,50 @@
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading.Tasks;
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.UnitTests.TestImplementations;
 using Microsoft.Extensions.Logging;

 namespace CryptoExchange.Net.UnitTests
 {
    public class TestBaseClient: BaseClient
    {       
-        public TestBaseClient(): base("Test", new BaseClientOptions())
+        public TestSubClient SubClient { get; }
+
+        public TestBaseClient(): base(null, "Test")
        {
+            var options = TestClientOptions.Default.Copy();
+            Initialize(options);
+            SubClient = AddApiClient(new TestSubClient(options, new RestApiOptions()));
        }

-        public TestBaseClient(BaseRestClientOptions exchangeOptions) : base("Test", exchangeOptions)
+        public TestBaseClient(TestClientOptions exchangeOptions) : base(null, "Test")
        {
+            Initialize(exchangeOptions);
+            SubClient = AddApiClient(new TestSubClient(exchangeOptions, new RestApiOptions()));
        }

        public void Log(LogLevel verbosity, string data)
        {
-            log.Write(verbosity, data);
+            _logger.Log(verbosity, data);
+        }
+    }
+
+    public class TestSubClient : RestApiClient
+    {
+        public TestSubClient(RestExchangeOptions<TestEnvironment> options, RestApiOptions apiOptions) : base(new TraceLogger(), null, "https://localhost:123", options, apiOptions)
+        {
        }

-        public CallResult<T> Deserialize<T>(string data)
-        {
-            return Deserialize<T>(data, null, null);
-        }
+        public CallResult<T> Deserialize<T>(string data) => Deserialize<T>(data, null, null);
+
+        public override TimeSpan? GetTimeOffset() => null;
+        public override TimeSyncInfo GetTimeSyncInfo() => null;
+        protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials) => throw new NotImplementedException();
+        protected override Task<WebCallResult<DateTime>> GetServerTimestampAsync() => throw new NotImplementedException();
    }

    public class TestAuthProvider : AuthenticationProvider
@@ -45,5 +64,8 @@ namespace CryptoExchange.Net.UnitTests
        {
            return toSign;
        }
+
+        public string GetKey() => _credentials.Key.GetString();
+        public string GetSecret() => _credentials.Secret.GetString();
    }
 }
@@ -12,6 +12,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Authentication;
 using System.Collections.Generic;
+using CryptoExchange.Net.Objects.Options;
+using Microsoft.Extensions.Logging;

 namespace CryptoExchange.Net.UnitTests.TestImplementations
 {
@@ -20,15 +22,22 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
        public TestRestApi1Client Api1 { get; }
        public TestRestApi2Client Api2 { get; }

-        public TestRestClient() : this(new TestClientOptions())
+        public TestRestClient(Action<TestClientOptions> optionsFunc) : this(optionsFunc, null)
        {
        }

-        public TestRestClient(TestClientOptions exchangeOptions) : base("Test", exchangeOptions)
+        public TestRestClient(ILoggerFactory loggerFactory = null, HttpClient httpClient = null) : this((x) => { }, httpClient, loggerFactory)
        {
-            Api1 = new TestRestApi1Client(exchangeOptions);
-            Api2 = new TestRestApi2Client(exchangeOptions);
-            RequestFactory = new Mock<IRequestFactory>().Object;
+        }
+
+        public TestRestClient(Action<TestClientOptions> optionsFunc, HttpClient httpClient = null, ILoggerFactory loggerFactory = null) : base(loggerFactory, "Test")
+        {
+            var options = TestClientOptions.Default.Copy();
+            optionsFunc(options);
+            Initialize(options);
+
+            Api1 = new TestRestApi1Client(options);
+            Api2 = new TestRestApi2Client(options);
        }

        public void SetResponse(string responseData, out IRequest requestObj)
@@ -50,7 +59,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
            request.Setup(c => c.AddHeader(It.IsAny<string>(), It.IsAny<string>())).Callback<string, string>((key, val) => headers.Add(key, new List<string> { val }));
            request.Setup(c => c.GetHeaders()).Returns(() => headers);

-            var factory = Mock.Get(RequestFactory);
+            var factory = Mock.Get(Api1.RequestFactory);
            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
                .Callback<HttpMethod, Uri, int>((method, uri, id) => 
                { 
@@ -58,6 +67,15 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
                    request.Setup(a => a.Method).Returns(method); 
                })
                .Returns(request.Object);
+
+            factory = Mock.Get(Api2.RequestFactory);
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+                .Callback<HttpMethod, Uri, int>((method, uri, id) =>
+                {
+                    request.Setup(a => a.Uri).Returns(uri);
+                    request.Setup(a => a.Method).Returns(method);
+                })
+                .Returns(request.Object);
            requestObj = request.Object;
        }

@@ -71,7 +89,12 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
            request.Setup(c => c.GetHeaders()).Returns(new Dictionary<string, IEnumerable<string>>());
            request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Throws(we);

-            var factory = Mock.Get(RequestFactory);
+            var factory = Mock.Get(Api1.RequestFactory);
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+                .Returns(request.Object);
+
+
+            factory = Mock.Get(Api2.RequestFactory);
            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
                .Returns(request.Object);
        }
@@ -94,27 +117,33 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
            request.Setup(c => c.AddHeader(It.IsAny<string>(), It.IsAny<string>())).Callback<string, string>((key, val) => headers.Add(key, new List<string> { val }));
            request.Setup(c => c.GetHeaders()).Returns(headers);

-            var factory = Mock.Get(RequestFactory);
+            var factory = Mock.Get(Api1.RequestFactory);
            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
                .Callback<HttpMethod, Uri, int>((method, uri, id) => request.Setup(a => a.Uri).Returns(uri))
                .Returns(request.Object);
-        }

-        public async Task<CallResult<T>> Request<T>(CancellationToken ct = default) where T:class
-        {
-            return await SendRequestAsync<T>(Api1, new Uri("http://www.test.com"), HttpMethod.Get, ct);
-        }
-
-        public async Task<CallResult<T>> RequestWithParams<T>(HttpMethod method, Dictionary<string, object> parameters, Dictionary<string, string> headers) where T : class
-        {
-            return await SendRequestAsync<T>(Api1, new Uri("http://www.test.com"), method, default, parameters, additionalHeaders: headers);
+            factory = Mock.Get(Api2.RequestFactory);
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+                .Callback<HttpMethod, Uri, int>((method, uri, id) => request.Setup(a => a.Uri).Returns(uri))
+                .Returns(request.Object);
        }
    }

    public class TestRestApi1Client : RestApiClient
    {
-        public TestRestApi1Client(TestClientOptions options): base(options, options.Api1Options)
+        public TestRestApi1Client(TestClientOptions options) : base(new TraceLogger(), null, "https://localhost:123", options, options.Api1Options)
        {
+            RequestFactory = new Mock<IRequestFactory>().Object;
+        }
+
+        public async Task<CallResult<T>> Request<T>(CancellationToken ct = default) where T : class
+        {
+            return await SendRequestAsync<T>(new Uri("http://www.test.com"), HttpMethod.Get, ct);
+        }
+
+        public async Task<CallResult<T>> RequestWithParams<T>(HttpMethod method, Dictionary<string, object> parameters, Dictionary<string, string> headers) where T : class
+        {
+            return await SendRequestAsync<T>(new Uri("http://www.test.com"), method, default, parameters, additionalHeaders: headers);
        }

        public void SetParameterPosition(HttpMethod method, HttpMethodParameterPosition position)
@@ -122,7 +151,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
            ParameterPositions[method] = position;
        }

-        public override TimeSpan GetTimeOffset()
+        public override TimeSpan? GetTimeOffset()
        {
            throw new NotImplementedException();
        }
@@ -135,7 +164,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
            throw new NotImplementedException();
        }

-        protected override TimeSyncInfo GetTimeSyncInfo()
+        public override TimeSyncInfo GetTimeSyncInfo()
        {
            throw new NotImplementedException();
        }
@@ -143,12 +172,22 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations

    public class TestRestApi2Client : RestApiClient
    {
-        public TestRestApi2Client(TestClientOptions options) : base(options, options.Api2Options)
+        public TestRestApi2Client(TestClientOptions options) : base(new TraceLogger(), null, "https://localhost:123", options, options.Api2Options)
        {
-
+            RequestFactory = new Mock<IRequestFactory>().Object;
        }

-        public override TimeSpan GetTimeOffset()
+        public async Task<CallResult<T>> Request<T>(CancellationToken ct = default) where T : class
+        {
+            return await SendRequestAsync<T>(new Uri("http://www.test.com"), HttpMethod.Get, ct);
+        }
+
+        protected override Error ParseErrorResponse(JToken error)
+        {
+            return new ServerError((int)error["errorCode"], (string)error["errorMessage"]);
+        }
+
+        public override TimeSpan? GetTimeOffset()
        {
            throw new NotImplementedException();
        }
@@ -161,34 +200,15 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
            throw new NotImplementedException();
        }

-        protected override TimeSyncInfo GetTimeSyncInfo()
+        public override TimeSyncInfo GetTimeSyncInfo()
        {
            throw new NotImplementedException();
        }
    }

-    public class TestAuthProvider : AuthenticationProvider
-    {
-        public TestAuthProvider(ApiCredentials credentials) : base(credentials)
-        {
-        }
-
-        public override void AuthenticateRequest(RestApiClient apiClient, Uri uri, HttpMethod method, Dictionary<string, object> providedParameters, bool auth, ArrayParametersSerialization arraySerialization, HttpMethodParameterPosition parameterPosition, out SortedDictionary<string, object> uriParameters, out SortedDictionary<string, object> bodyParameters, out Dictionary<string, string> headers)
-        {
-            uriParameters = parameterPosition == HttpMethodParameterPosition.InUri ? new SortedDictionary<string, object>(providedParameters) : new SortedDictionary<string, object>();
-            bodyParameters = parameterPosition == HttpMethodParameterPosition.InBody ? new SortedDictionary<string, object>(providedParameters) : new SortedDictionary<string, object>();
-            headers = new Dictionary<string, string>();
-        }
-    }
-
    public class ParseErrorTestRestClient: TestRestClient
    {
        public ParseErrorTestRestClient() { }
-        public ParseErrorTestRestClient(TestClientOptions exchangeOptions) : base(exchangeOptions) { }

-        protected override Error ParseErrorResponse(JToken error)
-        {
-            return new ServerError((int)error["errorCode"], (string)error["errorMessage"]);
-        }
    }
 }
@@ -13,9 +13,15 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
        public bool Connected { get; set; }

        public event Action OnClose;
+
+#pragma warning disable 0067
+        public event Action OnReconnected;
+        public event Action OnReconnecting;
+#pragma warning restore 0067
        public event Action<string> OnMessage;
        public event Action<Exception> OnError;
        public event Action OnOpen;
+        public Func<Task<Uri>> GetReconnectionUrl { get; set; }

        public int Id { get; }
        public bool ShouldReconnect { get; set; }
@@ -40,6 +46,8 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations

        public Uri Uri => new Uri("");

+        public TimeSpan KeepAliveInterval { get; set; }
+
        public static int lastId = 0;
        public static object lastIdLock = new object();

@@ -91,6 +99,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
        {
            Connected = false;
            DisconnectTime = DateTime.UtcNow;
+            Reconnecting = true;
            OnClose?.Invoke();
        }

@@ -113,11 +122,6 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
        {
            OnError?.Invoke(error);
        }
-
-        public async Task ProcessAsync()
-        {
-            while (Connected)
-                await Task.Delay(50);
-        }
+        public Task ReconnectAsync() => Task.CompletedTask;
    }
 }
@@ -1,10 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Logging;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.Sockets;
+using Microsoft.Extensions.Logging;
 using Moq;
 using Newtonsoft.Json.Linq;

@@ -14,22 +16,72 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
    {
        public TestSubSocketClient SubClient { get; }

-        public TestSocketClient() : this(new TestOptions())
+        public TestSocketClient(ILoggerFactory loggerFactory = null) : this((x) => { }, loggerFactory)
        {
        }

-        public TestSocketClient(TestOptions exchangeOptions) : base("test", exchangeOptions)
+        /// <summary>
+        /// Create a new instance of KucoinSocketClient
+        /// </summary>
+        /// <param name="optionsFunc">Configure the options to use for this client</param>
+        public TestSocketClient(Action<TestSocketOptions> optionsFunc) : this(optionsFunc, null)
        {
-            SubClient = new TestSubSocketClient(exchangeOptions, exchangeOptions.SubOptions);
-            SocketFactory = new Mock<IWebsocketFactory>().Object;
-            Mock.Get(SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<Log>(), It.IsAny<string>())).Returns(new TestSocket());
+        }
+
+        public TestSocketClient(Action<TestSocketOptions> optionsFunc, ILoggerFactory loggerFactory = null) : base(loggerFactory, "Test")
+        {
+            var options = TestSocketOptions.Default.Copy<TestSocketOptions>();
+            optionsFunc(options);
+            Initialize(options);
+
+            SubClient = AddApiClient(new TestSubSocketClient(options, options.SubOptions));
+            SubClient.SocketFactory = new Mock<IWebsocketFactory>().Object;
+            Mock.Get(SubClient.SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<ILogger>(), It.IsAny<WebSocketParameters>())).Returns(new TestSocket());
        }

        public TestSocket CreateSocket()
        {
-            Mock.Get(SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<Log>(), It.IsAny<string>())).Returns(new TestSocket());
-            return (TestSocket)CreateSocket("123");
+            Mock.Get(SubClient.SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<ILogger>(), It.IsAny<WebSocketParameters>())).Returns(new TestSocket());
+            return (TestSocket)SubClient.CreateSocketInternal("https://localhost:123/");
        }
+                
+    }
+
+    public class TestEnvironment : TradeEnvironment
+    {
+        public string TestAddress { get; }
+
+        public TestEnvironment(string name, string url) : base(name)
+        {
+            TestAddress = url;
+        }
+    }
+
+    public class TestSocketOptions: SocketExchangeOptions<TestEnvironment>
+    {
+        public static TestSocketOptions Default = new TestSocketOptions
+        {
+            Environment = new TestEnvironment("Live", "https://test.test")
+        };
+
+        public SocketApiOptions SubOptions { get; set; } = new SocketApiOptions();
+    }
+
+    public class TestSubSocketClient : SocketApiClient
+    {
+
+        public TestSubSocketClient(TestSocketOptions options, SocketApiOptions apiOptions): base(new TraceLogger(), options.Environment.TestAddress, options, apiOptions)
+        {
+
+        }
+
+        internal IWebsocket CreateSocketInternal(string address)
+        {
+            return CreateSocket(address);
+        }
+
+        protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
+            => new TestAuthProvider(credentials);

        public CallResult<bool> ConnectSocketSub(SocketConnection sub)
        {
@@ -67,21 +119,4 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
            throw new NotImplementedException();
        }
    }
-
-    public class TestOptions: BaseSocketClientOptions
-    {
-        public ApiClientOptions SubOptions { get; set; } = new ApiClientOptions();
-    }
-
-    public class TestSubSocketClient : SocketApiClient
-    {
-
-        public TestSubSocketClient(BaseClientOptions options, ApiClientOptions apiOptions): base(options, apiOptions)
-        {
-
-        }
-
-        protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
-            => new TestAuthProvider(credentials);
-    }
 }
@@ -1,25 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Text;
-
-namespace CryptoExchange.Net.UnitTests.TestImplementations
-{
-    public class TestStringLogger : ILogger
-    {
-        StringBuilder _builder = new StringBuilder();
-
-        public IDisposable BeginScope<TState>(TState state) => null;
-
-        public bool IsEnabled(LogLevel logLevel) => true;
-
-        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
-        {
-            _builder.AppendLine(formatter(state, exception));
-        }
-
-        public string GetLogs()
-        {
-            return _builder.ToString();
-        }
-    }
-}
@@ -1 +1,6 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("CryptoExchange.Net.UnitTests")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("CryptoExchange.Net.UnitTests")]
+
+namespace System.Runtime.CompilerServices
+{
+    internal static class IsExternalInit { }
+}
@@ -22,17 +22,17 @@ namespace CryptoExchange.Net.Authentication
        public SecureString? Secret { get; }

        /// <summary>
-        /// The private key to authenticate requests
+        /// Type of the credentials
        /// </summary>
-        public PrivateKey? PrivateKey { get; }
+        public ApiCredentialsType CredentialType { get; }

        /// <summary>
-        /// Create Api credentials providing a private key for authentication
+        /// Create Api credentials providing an api key and secret for authentication
        /// </summary>
-        /// <param name="privateKey">The private key used for signing</param>
-        public ApiCredentials(PrivateKey privateKey)
+        /// <param name="key">The api key used for identification</param>
+        /// <param name="secret">The api secret used for signing</param>
+        public ApiCredentials(SecureString key, SecureString secret) : this(key, secret, ApiCredentialsType.Hmac)
        {
-            PrivateKey = privateKey;
        }

        /// <summary>
@@ -40,11 +40,13 @@ namespace CryptoExchange.Net.Authentication
        /// </summary>
        /// <param name="key">The api key used for identification</param>
        /// <param name="secret">The api secret used for signing</param>
-        public ApiCredentials(SecureString key, SecureString secret)
+        /// <param name="credentialsType">The type of credentials</param>
+        public ApiCredentials(SecureString key, SecureString secret, ApiCredentialsType credentialsType)
        {
            if (key == null || secret == null)
                throw new ArgumentException("Key and secret can't be null/empty");

+            CredentialType = credentialsType;
            Key = key;
            Secret = secret;
        }
@@ -54,11 +56,22 @@ namespace CryptoExchange.Net.Authentication
        /// </summary>
        /// <param name="key">The api key used for identification</param>
        /// <param name="secret">The api secret used for signing</param>
-        public ApiCredentials(string key, string secret)
+        public ApiCredentials(string key, string secret) : this(key, secret, ApiCredentialsType.Hmac)
+        {
+        }
+
+        /// <summary>
+        /// Create Api credentials providing an api key and secret for authentication
+        /// </summary>
+        /// <param name="key">The api key used for identification</param>
+        /// <param name="secret">The api secret used for signing</param>
+        /// <param name="credentialsType">The type of credentials</param>
+        public ApiCredentials(string key, string secret, ApiCredentialsType credentialsType)
        {
            if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(secret))
                throw new ArgumentException("Key and secret can't be null/empty");

+            CredentialType = credentialsType;
            Key = key.ToSecureString();
            Secret = secret.ToSecureString();
        }
@@ -69,11 +82,8 @@ namespace CryptoExchange.Net.Authentication
        /// <returns></returns>
        public virtual ApiCredentials Copy()
        {
-            if (PrivateKey == null)
-                // Use .GetString() to create a copy of the SecureString
-                return new ApiCredentials(Key!.GetString(), Secret!.GetString());
-            else
-                return new ApiCredentials(PrivateKey!.Copy());
+            // Use .GetString() to create a copy of the SecureString
+            return new ApiCredentials(Key!.GetString(), Secret!.GetString(), CredentialType);
        }

        /// <summary>
@@ -123,7 +133,6 @@ namespace CryptoExchange.Net.Authentication
        {
            Key?.Dispose();
            Secret?.Dispose();
-            PrivateKey?.Dispose();
        }
    }
 }
@@ -0,0 +1,21 @@
+namespace CryptoExchange.Net.Authentication
+{
+    /// <summary>
+    /// Credentials type
+    /// </summary>
+    public enum ApiCredentialsType
+    {
+        /// <summary>
+        /// Hmac keys credentials
+        /// </summary>
+        Hmac,
+        /// <summary>
+        /// Rsa keys credentials in xml format
+        /// </summary>
+        RsaXml,
+        /// <summary>
+        /// Rsa keys credentials in pem/base64 format. Only available for .NetStandard 2.1 and up, use xml format for lower.
+        /// </summary>
+        RsaPem
+    }
+}
@@ -12,14 +12,15 @@ namespace CryptoExchange.Net.Authentication
    /// <summary>
    /// Base class for authentication providers
    /// </summary>
-    public abstract class AuthenticationProvider
+    public abstract class AuthenticationProvider : IDisposable
    {
        /// <summary>
-        /// The provided credentials
+        /// Provided credentials
        /// </summary>
-        public ApiCredentials Credentials { get; }
+        protected readonly ApiCredentials _credentials;

        /// <summary>
+        /// Byte representation of the secret
        /// </summary>
        protected byte[] _sBytes;

@@ -32,7 +33,7 @@ namespace CryptoExchange.Net.Authentication
            if (credentials.Secret == null)
                throw new ArgumentException("ApiKey/Secret needed");

-            Credentials = credentials;
+            _credentials = credentials;
            _sBytes = Encoding.UTF8.GetBytes(credentials.Secret.GetString());
        }

@@ -83,7 +84,7 @@ namespace CryptoExchange.Net.Authentication
        {
            using var encryptor = SHA256.Create();
            var resultBytes = encryptor.ComputeHash(Encoding.UTF8.GetBytes(data));
-            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes): BytesToHexString(resultBytes);
+            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
        }

        /// <summary>
@@ -173,6 +174,47 @@ namespace CryptoExchange.Net.Authentication
            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
        }

+        /// <summary>
+        /// SHA256 sign the data
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="outputType"></param>
+        /// <returns></returns>
+        protected string SignRSASHA256(byte[] data, SignOutputType? outputType = null)
+        {
+            using var rsa = RSA.Create();
+            if (_credentials.CredentialType == ApiCredentialsType.RsaPem)
+            {
+#if NETSTANDARD2_1_OR_GREATER
+                // Read from pem private key
+                var key = _credentials.Secret!.GetString()
+                        .Replace("\n", "")
+                        .Replace("-----BEGIN PRIVATE KEY-----", "")
+                        .Replace("-----END PRIVATE KEY-----", "")
+                        .Trim();
+                rsa.ImportPkcs8PrivateKey(Convert.FromBase64String(
+                    key)
+                    , out _);
+#else
+                throw new Exception("Pem format not supported when running from .NetStandard2.0. Convert the private key to xml format.");
+#endif
+            }
+            else if (_credentials.CredentialType == ApiCredentialsType.RsaXml)
+            {
+                // Read from xml private key format
+                rsa.FromXmlString(_credentials.Secret!.GetString());
+            }
+            else
+            {
+                throw new Exception("Invalid credentials type");
+            }
+
+            using var sha256 = SHA256.Create();
+            var hash = sha256.ComputeHash(data);
+            var resultBytes = rsa.SignHash(hash, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+            return outputType == SignOutputType.Base64? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
+        }
+
        /// <summary>
        /// Sign a string
        /// </summary>
@@ -223,7 +265,7 @@ namespace CryptoExchange.Net.Authentication
        /// <returns></returns>
        protected static DateTime GetTimestamp(RestApiClient apiClient)
        {
-            return DateTime.UtcNow.Add(apiClient?.GetTimeOffset() ?? TimeSpan.Zero)!;
+            return DateTime.UtcNow.Add(apiClient.GetTimeOffset() ?? TimeSpan.Zero)!;
        }

        /// <summary>
@@ -235,5 +277,26 @@ namespace CryptoExchange.Net.Authentication
        {
            return DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient)).Value.ToString(CultureInfo.InvariantCulture);
        }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            _credentials?.Dispose();
+        }
+    }
+
+    /// <inheritdoc />
+    public abstract class AuthenticationProvider<TApiCredentials> : AuthenticationProvider where TApiCredentials : ApiCredentials
+    {
+        /// <inheritdoc />
+        protected new TApiCredentials _credentials => (TApiCredentials)base._credentials;
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="credentials"></param>
+        protected AuthenticationProvider(TApiCredentials credentials) : base(credentials)
+        {
+        }
    }
 }
@@ -1,110 +0,0 @@
-using System;
-using System.Security;
-
-namespace CryptoExchange.Net.Authentication
-{
-    /// <summary>
-    /// Private key info
-    /// </summary>
-    public class PrivateKey : IDisposable
-    {
-        /// <summary>
-        /// The private key
-        /// </summary>
-        public SecureString Key { get; }
-
-        /// <summary>
-        /// The private key's pass phrase
-        /// </summary>
-        public SecureString? Passphrase { get; }
-
-        /// <summary>
-        /// Indicates if the private key is encrypted or not
-        /// </summary>
-        public bool IsEncrypted { get; }
-
-        /// <summary>
-        /// Create a private key providing an encrypted key information
-        /// </summary>
-        /// <param name="key">The private key used for signing</param>
-        /// <param name="passphrase">The private key's passphrase</param>
-        public PrivateKey(SecureString key, SecureString passphrase)
-        {
-            Key = key;
-            Passphrase = passphrase;
-
-            IsEncrypted = true;
-        }
-
-        /// <summary>
-        /// Create a private key providing an encrypted key information
-        /// </summary>
-        /// <param name="key">The private key used for signing</param>
-        /// <param name="passphrase">The private key's passphrase</param>
-        public PrivateKey(string key, string passphrase)
-        {
-            if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(passphrase))
-                throw new ArgumentException("Key and passphrase can't be null/empty");
-
-            var secureKey = new SecureString();
-            foreach (var c in key)
-                secureKey.AppendChar(c);
-            secureKey.MakeReadOnly();
-            Key = secureKey;
-
-            var securePassphrase = new SecureString();
-            foreach (var c in passphrase)
-                securePassphrase.AppendChar(c);
-            securePassphrase.MakeReadOnly();
-            Passphrase = securePassphrase;
-
-            IsEncrypted = true;
-        }
-
-        /// <summary>
-        /// Create a private key providing an unencrypted key information
-        /// </summary>
-        /// <param name="key">The private key used for signing</param>
-        public PrivateKey(SecureString key)
-        {
-            Key = key;
-
-            IsEncrypted = false;
-        }
-
-        /// <summary>
-        /// Create a private key providing an encrypted key information
-        /// </summary>
-        /// <param name="key">The private key used for signing</param>
-        public PrivateKey(string key)
-        {
-            if (string.IsNullOrEmpty(key))
-                throw new ArgumentException("Key can't be null/empty");
-
-            Key = key.ToSecureString();
-
-            IsEncrypted = false;
-        }
-
-        /// <summary>
-        /// Copy the private key
-        /// </summary>
-        /// <returns></returns>
-        public PrivateKey Copy()
-        {
-            if (Passphrase == null)
-                return new PrivateKey(Key.GetString());
-            else
-                return new PrivateKey(Key.GetString(), Passphrase.GetString());
-        }
-
-        /// <summary>
-        /// Dispose
-        /// </summary>
-        public void Dispose()
-        {
-            Key?.Dispose();
-            Passphrase?.Dispose();
-        }
-    }
-}
@@ -1,37 +1,40 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Net;
 using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
 using CryptoExchange.Net.Authentication;
+using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;

 namespace CryptoExchange.Net
 {
    /// <summary>
    /// Base API for all API clients
    /// </summary>
-    public abstract class BaseApiClient: IDisposable
+    public abstract class BaseApiClient : IDisposable, IBaseApiClient
    {
-        private ApiCredentials? _apiCredentials;
-        private AuthenticationProvider? _authenticationProvider;
-        private bool _created;
-        private bool _disposing;
+        /// <summary>
+        /// Logger
+        /// </summary>
+        protected ILogger _logger;
+
+        /// <summary>
+        /// If we are disposing
+        /// </summary>
+        protected bool _disposing;

        /// <summary>
        /// The authentication provider for this API client. (null if no credentials are set)
        /// </summary>
-        public AuthenticationProvider? AuthenticationProvider
-        {
-            get 
-            {
-                if (!_created && !_disposing && _apiCredentials != null)
-                {
-                    _authenticationProvider = CreateAuthenticationProvider(_apiCredentials);
-                    _created = true;
-                }
-
-                return _authenticationProvider;
-            }
-        }
+        public AuthenticationProvider? AuthenticationProvider { get; private set; }

        /// <summary>
        /// Where to put the parameters for requests with different Http methods
@@ -65,25 +68,66 @@ namespace CryptoExchange.Net
        public string requestBodyEmptyContent = "{}";

        /// <summary>
-        /// The base address for this API client
+        /// The environment this client communicates to
        /// </summary>
-        internal protected string BaseAddress { get; }
+        public string BaseAddress { get; }

        /// <summary>
-        /// Api client options
+        /// Output the original string data along with the deserialized object
        /// </summary>
-        internal ApiClientOptions Options { get; }
+        public bool OutputOriginalData { get; }
+
+        /// <summary>
+        /// The last used id, use NextId() to get the next id and up this
+        /// </summary>
+        protected static int _lastId;
+        /// <summary>
+        /// Lock for id generating
+        /// </summary>
+        protected static object _idLock = new();
+
+        /// <summary>
+        /// A default serializer
+        /// </summary>
+        private static readonly JsonSerializer _defaultSerializer = JsonSerializer.Create(new JsonSerializerSettings
+        {
+            DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+            Culture = CultureInfo.InvariantCulture
+        });
+
+        /// <summary>
+        /// Api options
+        /// </summary>
+        public ApiOptions ApiOptions { get; }
+
+        /// <summary>
+        /// Client Options
+        /// </summary>
+        public ExchangeOptions ClientOptions { get; }

        /// <summary>
        /// ctor
        /// </summary>
-        /// <param name="options">Client options</param>
-        /// <param name="apiOptions">Api client options</param>
-        protected BaseApiClient(BaseClientOptions options, ApiClientOptions apiOptions)
+        /// <param name="logger">Logger</param>
+        /// <param name="outputOriginalData">Should data from this client include the orginal data in the call result</param>
+        /// <param name="baseAddress">Base address for this API client</param>
+        /// <param name="apiCredentials">Api credentials</param>
+        /// <param name="clientOptions">Client options</param>
+        /// <param name="apiOptions">Api options</param>
+        protected BaseApiClient(ILogger logger, bool outputOriginalData, ApiCredentials? apiCredentials, string baseAddress, ExchangeOptions clientOptions, ApiOptions apiOptions)
        {
-            Options = apiOptions;
-            _apiCredentials = apiOptions.ApiCredentials?.Copy() ?? options.ApiCredentials?.Copy();
-            BaseAddress = apiOptions.BaseAddress;
+            _logger = logger;
+
+            ClientOptions = clientOptions;
+            ApiOptions = apiOptions;
+            OutputOriginalData = outputOriginalData;
+            BaseAddress = baseAddress;
+
+            if (apiCredentials != null)
+            {
+                AuthenticationProvider?.Dispose();
+                AuthenticationProvider = CreateAuthenticationProvider(apiCredentials.Copy());
+            }
        }

        /// <summary>
@@ -94,21 +138,226 @@ namespace CryptoExchange.Net
        protected abstract AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials);

        /// <inheritdoc />
-        public void SetApiCredentials(ApiCredentials credentials)
+        public void SetApiCredentials<T>(T credentials) where T : ApiCredentials
        {
-            _apiCredentials = credentials?.Copy();
-            _created = false;
-            _authenticationProvider = null;
+            if (credentials != null)
+            {
+                AuthenticationProvider?.Dispose();
+                AuthenticationProvider = CreateAuthenticationProvider(credentials.Copy());
+            }
+        }
+
+        /// <summary>
+        /// Tries to parse the json data and return a JToken, validating the input not being empty and being valid json
+        /// </summary>
+        /// <param name="data">The data to parse</param>
+        /// <returns></returns>
+        protected CallResult<JToken> ValidateJson(string data)
+        {
+            if (string.IsNullOrEmpty(data))
+            {
+                var info = "Empty data object received";
+                _logger.Log(LogLevel.Error, info);
+                return new CallResult<JToken>(new DeserializeError(info, data));
+            }
+
+            try
+            {
+                return new CallResult<JToken>(JToken.Parse(data));
+            }
+            catch (JsonReaderException jre)
+            {
+                var info = $"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}";
+                return new CallResult<JToken>(new DeserializeError(info, data));
+            }
+            catch (JsonSerializationException jse)
+            {
+                var info = $"Deserialize JsonSerializationException: {jse.Message}";
+                return new CallResult<JToken>(new DeserializeError(info, data));
+            }
+            catch (Exception ex)
+            {
+                var exceptionInfo = ex.ToLogString();
+                var info = $"Deserialize Unknown Exception: {exceptionInfo}";
+                return new CallResult<JToken>(new DeserializeError(info, data));
+            }
+        }
+
+        /// <summary>
+        /// Deserialize a string into an object
+        /// </summary>
+        /// <typeparam name="T">The type to deserialize into</typeparam>
+        /// <param name="data">The data to deserialize</param>
+        /// <param name="serializer">A specific serializer to use</param>
+        /// <param name="requestId">Id of the request the data is returned from (used for grouping logging by request)</param>
+        /// <returns></returns>
+        protected CallResult<T> Deserialize<T>(string data, JsonSerializer? serializer = null, int? requestId = null)
+        {
+            var tokenResult = ValidateJson(data);
+            if (!tokenResult)
+            {
+                _logger.Log(LogLevel.Error, tokenResult.Error!.Message);
+                return new CallResult<T>(tokenResult.Error);
+            }
+
+            return Deserialize<T>(tokenResult.Data, serializer, requestId);
+        }
+
+        /// <summary>
+        /// Deserialize a JToken into an object
+        /// </summary>
+        /// <typeparam name="T">The type to deserialize into</typeparam>
+        /// <param name="obj">The data to deserialize</param>
+        /// <param name="serializer">A specific serializer to use</param>
+        /// <param name="requestId">Id of the request the data is returned from (used for grouping logging by request)</param>
+        /// <returns></returns>
+        protected CallResult<T> Deserialize<T>(JToken obj, JsonSerializer? serializer = null, int? requestId = null)
+        {
+            serializer ??= _defaultSerializer;
+
+            try
+            {
+                return new CallResult<T>(obj.ToObject<T>(serializer)!);
+            }
+            catch (JsonReaderException jre)
+            {
+                var info = $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize JsonReaderException: {jre.Message} Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}, data: {obj}";
+                _logger.Log(LogLevel.Error, info);
+                return new CallResult<T>(new DeserializeError(info, obj));
+            }
+            catch (JsonSerializationException jse)
+            {
+                var info = $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize JsonSerializationException: {jse.Message} data: {obj}";
+                _logger.Log(LogLevel.Error, info);
+                return new CallResult<T>(new DeserializeError(info, obj));
+            }
+            catch (Exception ex)
+            {
+                var exceptionInfo = ex.ToLogString();
+                var info = $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize Unknown Exception: {exceptionInfo}, data: {obj}";
+                _logger.Log(LogLevel.Error, info);
+                return new CallResult<T>(new DeserializeError(info, obj));
+            }
+        }
+
+        /// <summary>
+        /// Deserialize a stream into an object
+        /// </summary>
+        /// <typeparam name="T">The type to deserialize into</typeparam>
+        /// <param name="stream">The stream to deserialize</param>
+        /// <param name="serializer">A specific serializer to use</param>
+        /// <param name="requestId">Id of the request the data is returned from (used for grouping logging by request)</param>
+        /// <param name="elapsedMilliseconds">Milliseconds response time for the request this stream is a response for</param>
+        /// <returns></returns>
+        protected async Task<CallResult<T>> DeserializeAsync<T>(Stream stream, JsonSerializer? serializer = null, int? requestId = null, long? elapsedMilliseconds = null)
+        {
+            serializer ??= _defaultSerializer;
+            string? data = null;
+
+            try
+            {
+                // Let the reader keep the stream open so we're able to seek if needed. The calling method will close the stream.
+                using var reader = new StreamReader(stream, Encoding.UTF8, false, 512, true);
+                // If we have to output the original json data or output the data into the logging we'll have to read to full response
+                // in order to log/return the json data
+                if (OutputOriginalData == true)
+                {
+                    data = await reader.ReadToEndAsync().ConfigureAwait(false);
+                    _logger.Log(LogLevel.Debug, $"{(requestId != null ? $"[{requestId}] " : "")}Response received{(elapsedMilliseconds != null ? $" in {elapsedMilliseconds}" : " ")}ms: " + data);
+                    var result = Deserialize<T>(data, serializer, requestId);
+                    result.OriginalData = data;
+                    return result;
+                }
+
+                // If we don't have to keep track of the original json data we can use the JsonTextReader to deserialize the stream directly
+                // into the desired object, which has increased performance over first reading the string value into memory and deserializing from that
+                using var jsonReader = new JsonTextReader(reader);
+                _logger.Log(LogLevel.Debug, $"{(requestId != null ? $"[{requestId}] " : "")}Response received{(elapsedMilliseconds != null ? $" in {elapsedMilliseconds}" : " ")}ms");
+                return new CallResult<T>(serializer.Deserialize<T>(jsonReader)!);
+            }
+            catch (JsonReaderException jre)
+            {
+                if (data == null)
+                {
+                    if (stream.CanSeek)
+                    {
+                        // If we can seek the stream rewind it so we can retrieve the original data that was sent
+                        stream.Seek(0, SeekOrigin.Begin);
+                        data = await ReadStreamAsync(stream).ConfigureAwait(false);
+                    }
+                    else
+                    {
+                        data = "[Data only available in Trace LogLevel]";
+                    }
+                }
+                _logger.Log(LogLevel.Error, $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}, data: {data}");
+                return new CallResult<T>(new DeserializeError($"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}", data));
+            }
+            catch (JsonSerializationException jse)
+            {
+                if (data == null)
+                {
+                    if (stream.CanSeek)
+                    {
+                        stream.Seek(0, SeekOrigin.Begin);
+                        data = await ReadStreamAsync(stream).ConfigureAwait(false);
+                    }
+                    else
+                    {
+                        data = "[Data only available in Trace LogLevel]";
+                    }
+                }
+
+                _logger.Log(LogLevel.Error, $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize JsonSerializationException: {jse.Message}, data: {data}");
+                return new CallResult<T>(new DeserializeError($"Deserialize JsonSerializationException: {jse.Message}", data));
+            }
+            catch (Exception ex)
+            {
+                if (data == null)
+                {
+                    if (stream.CanSeek)
+                    {
+                        stream.Seek(0, SeekOrigin.Begin);
+                        data = await ReadStreamAsync(stream).ConfigureAwait(false);
+                    }
+                    else
+                    {
+                        data = "[Data only available in Trace LogLevel]";
+                    }
+                }
+
+                var exceptionInfo = ex.ToLogString();
+                _logger.Log(LogLevel.Error, $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize Unknown Exception: {exceptionInfo}, data: {data}");
+                return new CallResult<T>(new DeserializeError($"Deserialize Unknown Exception: {exceptionInfo}", data));
+            }
+        }
+
+        private static async Task<string> ReadStreamAsync(Stream stream)
+        {
+            using var reader = new StreamReader(stream, Encoding.UTF8, false, 512, true);
+            return await reader.ReadToEndAsync().ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Generate a new unique id. The id is staticly stored so it is guarenteed to be unique across different client instances
+        /// </summary>
+        /// <returns></returns>
+        protected static int NextId()
+        {
+            lock (_idLock)
+            {
+                _lastId += 1;
+                return _lastId;
+            }
        }

        /// <summary>
        /// Dispose
        /// </summary>
-        public void Dispose()
+        public virtual void Dispose()
        {
            _disposing = true;
-            _apiCredentials?.Dispose();
-            AuthenticationProvider?.Credentials?.Dispose();
+            AuthenticationProvider?.Dispose();
        }
    }
 }
@@ -1,15 +1,10 @@
 using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Logging;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using Microsoft.Extensions.Logging.Abstractions;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;

 namespace CryptoExchange.Net
 {
@@ -22,53 +17,58 @@ namespace CryptoExchange.Net
        /// The name of the API the client is for
        /// </summary>
        internal string Name { get; }
+
        /// <summary>
        /// Api clients in this client
        /// </summary>
        internal List<BaseApiClient> ApiClients { get; } = new List<BaseApiClient>();
+
        /// <summary>
        /// The log object
        /// </summary>
-        protected internal Log log;
-        /// <summary>
-        /// The last used id, use NextId() to get the next id and up this
-        /// </summary>
-        protected static int lastId;
-        /// <summary>
-        /// Lock for id generating
-        /// </summary>
-        protected static object idLock = new object();
-
-        /// <summary>
-        /// A default serializer
-        /// </summary>
-        private static readonly JsonSerializer defaultSerializer = JsonSerializer.Create(new JsonSerializerSettings
-        {
-            DateTimeZoneHandling = DateTimeZoneHandling.Utc,
-            Culture = CultureInfo.InvariantCulture
-        });
-
+        protected internal ILogger _logger;
+        
        /// <summary>
        /// Provided client options
        /// </summary>
-        public BaseClientOptions ClientOptions { get; }
+        public ExchangeOptions ClientOptions { get; private set; }

        /// <summary>
        /// ctor
        /// </summary>
+        /// <param name="logger">Logger</param>
        /// <param name="name">The name of the API this client is for</param>
-        /// <param name="options">The options for this client</param>
-        protected BaseClient(string name, BaseClientOptions options)
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+        protected BaseClient(ILoggerFactory? logger, string name)
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
        {
-            log = new Log(name);
-            log.UpdateWriters(options.LogWriters);
-            log.Level = options.LogLevel;
-
-            ClientOptions = options;
+            _logger = logger?.CreateLogger(name) ?? NullLoggerFactory.Instance.CreateLogger(name);

            Name = name;
+        }

-            log.Write(LogLevel.Trace, $"Client configuration: {options}, CryptoExchange.Net: v{typeof(BaseClient).Assembly.GetName().Version}, {name}.Net: v{GetType().Assembly.GetName().Version}");
+        /// <summary>
+        /// Initialize the client with the specified options
+        /// </summary>
+        /// <param name="options"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public virtual void Initialize(ExchangeOptions options)
+        {
+            if (options == null)
+                throw new ArgumentNullException(nameof(options));
+
+            ClientOptions = options;
+            _logger.Log(LogLevel.Trace, $"Client configuration: {options}, CryptoExchange.Net: v{typeof(BaseClient).Assembly.GetName().Version}, {Name}.Net: v{GetType().Assembly.GetName().Version}");
+        }
+
+        /// <summary>
+        /// Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
+        /// </summary>
+        /// <param name="credentials">The credentials to set</param>
+        protected virtual void SetApiCredentials<T>(T credentials) where T : ApiCredentials
+        {
+            foreach (var apiClient in ApiClients)
+                apiClient.SetApiCredentials(credentials);
        }

        /// <summary>
@@ -77,217 +77,20 @@ namespace CryptoExchange.Net
        /// <param name="apiClient">The client</param>
        protected T AddApiClient<T>(T apiClient) where T:  BaseApiClient
        {
-            log.Write(LogLevel.Trace, $"  {apiClient.GetType().Name} configuration: {apiClient.Options}");
+            if (ClientOptions == null)
+                throw new InvalidOperationException("Client should have called Initialize before adding API clients");
+
+            _logger.Log(LogLevel.Trace, $"  {apiClient.GetType().Name}, base address: {apiClient.BaseAddress}");
            ApiClients.Add(apiClient);
            return apiClient;
        }

-        /// <summary>
-        /// Tries to parse the json data and return a JToken, validating the input not being empty and being valid json
-        /// </summary>
-        /// <param name="data">The data to parse</param>
-        /// <returns></returns>
-        protected CallResult<JToken> ValidateJson(string data)
-        {
-            if (string.IsNullOrEmpty(data))
-            {
-                var info = "Empty data object received";
-                log.Write(LogLevel.Error, info);
-                return new CallResult<JToken>(new DeserializeError(info, data));
-            }
-
-            try
-            {
-                return new CallResult<JToken>(JToken.Parse(data));
-            }
-            catch (JsonReaderException jre)
-            {
-                var info = $"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}";
-                return new CallResult<JToken>(new DeserializeError(info, data));
-            }
-            catch (JsonSerializationException jse)
-            {
-                var info = $"Deserialize JsonSerializationException: {jse.Message}";
-                return new CallResult<JToken>(new DeserializeError(info, data));
-            }
-            catch (Exception ex)
-            {
-                var exceptionInfo = ex.ToLogString();
-                var info = $"Deserialize Unknown Exception: {exceptionInfo}";
-                return new CallResult<JToken>(new DeserializeError(info, data));
-            }
-        }
-
-        /// <summary>
-        /// Deserialize a string into an object
-        /// </summary>
-        /// <typeparam name="T">The type to deserialize into</typeparam>
-        /// <param name="data">The data to deserialize</param>
-        /// <param name="serializer">A specific serializer to use</param>
-        /// <param name="requestId">Id of the request the data is returned from (used for grouping logging by request)</param>
-        /// <returns></returns>
-        protected CallResult<T> Deserialize<T>(string data, JsonSerializer? serializer = null, int? requestId = null)
-        {
-            var tokenResult = ValidateJson(data);
-            if (!tokenResult)
-            {
-                log.Write(LogLevel.Error, tokenResult.Error!.Message);
-                return new CallResult<T>( tokenResult.Error);
-            }
-
-            return Deserialize<T>(tokenResult.Data, serializer, requestId);
-        }
-
-        /// <summary>
-        /// Deserialize a JToken into an object
-        /// </summary>
-        /// <typeparam name="T">The type to deserialize into</typeparam>
-        /// <param name="obj">The data to deserialize</param>
-        /// <param name="serializer">A specific serializer to use</param>
-        /// <param name="requestId">Id of the request the data is returned from (used for grouping logging by request)</param>
-        /// <returns></returns>
-        protected CallResult<T> Deserialize<T>(JToken obj, JsonSerializer? serializer = null, int? requestId = null)
-        {
-            serializer ??= defaultSerializer;
-
-            try
-            {
-                return new CallResult<T>(obj.ToObject<T>(serializer)!);
-            }
-            catch (JsonReaderException jre)
-            {
-                var info = $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize JsonReaderException: {jre.Message} Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}, data: {obj}";
-                log.Write(LogLevel.Error, info);
-                return new CallResult<T>(new DeserializeError(info, obj));
-            }
-            catch (JsonSerializationException jse)
-            {
-                var info = $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize JsonSerializationException: {jse.Message} data: {obj}";
-                log.Write(LogLevel.Error, info);
-                return new CallResult<T>(new DeserializeError(info, obj));
-            }
-            catch (Exception ex)
-            {
-                var exceptionInfo = ex.ToLogString();
-                var info = $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize Unknown Exception: {exceptionInfo}, data: {obj}";
-                log.Write(LogLevel.Error, info);
-                return new CallResult<T>(new DeserializeError(info, obj));
-            }
-        }
-
-        /// <summary>
-        /// Deserialize a stream into an object
-        /// </summary>
-        /// <typeparam name="T">The type to deserialize into</typeparam>
-        /// <param name="stream">The stream to deserialize</param>
-        /// <param name="serializer">A specific serializer to use</param>
-        /// <param name="requestId">Id of the request the data is returned from (used for grouping logging by request)</param>
-        /// <param name="elapsedMilliseconds">Milliseconds response time for the request this stream is a response for</param>
-        /// <returns></returns>
-        protected async Task<CallResult<T>> DeserializeAsync<T>(Stream stream, JsonSerializer? serializer = null, int? requestId = null, long? elapsedMilliseconds = null)
-        {
-            serializer ??= defaultSerializer;
-            string? data = null;
-
-            try
-            {
-                // Let the reader keep the stream open so we're able to seek if needed. The calling method will close the stream.
-                using var reader = new StreamReader(stream, Encoding.UTF8, false, 512, true);
-
-                // If we have to output the original json data or output the data into the logging we'll have to read to full response
-                // in order to log/return the json data
-                if (ClientOptions.OutputOriginalData || log.Level == LogLevel.Trace)
-                {
-                    data = await reader.ReadToEndAsync().ConfigureAwait(false);
-                    log.Write(LogLevel.Debug, $"{(requestId != null ? $"[{requestId}] ": "")}Response received{(elapsedMilliseconds != null ? $" in {elapsedMilliseconds}" : " ")}ms{(log.Level == LogLevel.Trace ? (": " + data) : "")}");
-                    var result = Deserialize<T>(data, serializer, requestId);
-                    if(ClientOptions.OutputOriginalData)
-                        result.OriginalData = data;
-                    return result;
-                }
-                
-                // If we don't have to keep track of the original json data we can use the JsonTextReader to deserialize the stream directly
-                // into the desired object, which has increased performance over first reading the string value into memory and deserializing from that
-                using var jsonReader = new JsonTextReader(reader);
-                log.Write(LogLevel.Debug, $"{(requestId != null ? $"[{requestId}] ": "")}Response received{(elapsedMilliseconds != null ? $" in {elapsedMilliseconds}" : " ")}ms");
-                return new CallResult<T>(serializer.Deserialize<T>(jsonReader)!);
-            }
-            catch (JsonReaderException jre)
-            {
-                if (data == null)
-                {
-                    if (stream.CanSeek)
-                    {
-                        // If we can seek the stream rewind it so we can retrieve the original data that was sent
-                        stream.Seek(0, SeekOrigin.Begin);
-                        data = await ReadStreamAsync(stream).ConfigureAwait(false);
-                    }
-                    else
-                        data = "[Data only available in Trace LogLevel]";
-                }
-                log.Write(LogLevel.Error, $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}, data: {data}");
-                return new CallResult<T>(new DeserializeError($"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}", data));
-            }
-            catch (JsonSerializationException jse)
-            {
-                if (data == null)
-                {
-                    if (stream.CanSeek)
-                    {
-                        stream.Seek(0, SeekOrigin.Begin);
-                        data = await ReadStreamAsync(stream).ConfigureAwait(false);
-                    }
-                    else
-                        data = "[Data only available in Trace LogLevel]";
-                }
-
-                log.Write(LogLevel.Error, $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize JsonSerializationException: {jse.Message}, data: {data}");
-                return new CallResult<T>(new DeserializeError($"Deserialize JsonSerializationException: {jse.Message}", data));
-            }
-            catch (Exception ex)
-            {
-                if (data == null)
-                {
-                    if (stream.CanSeek)
-                    {
-                        stream.Seek(0, SeekOrigin.Begin);
-                        data = await ReadStreamAsync(stream).ConfigureAwait(false);
-                    }
-                    else
-                        data = "[Data only available in Trace LogLevel]";
-                }
-
-                var exceptionInfo = ex.ToLogString();
-                log.Write(LogLevel.Error, $"{(requestId != null ? $"[{requestId}] " : "")}Deserialize Unknown Exception: {exceptionInfo}, data: {data}");
-                return new CallResult<T>(new DeserializeError($"Deserialize Unknown Exception: {exceptionInfo}", data));
-            }
-        }
-
-        private static async Task<string> ReadStreamAsync(Stream stream)
-        { 
-            using var reader = new StreamReader(stream, Encoding.UTF8, false, 512, true);
-            return await reader.ReadToEndAsync().ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Generate a new unique id. The id is staticly stored so it is guarenteed to be unique across different client instances
-        /// </summary>
-        /// <returns></returns>
-        protected static int NextId()
-        {
-            lock (idLock)
-            {
-                lastId += 1;
-                return lastId;
-            }
-        }
-
        /// <summary>
        /// Dispose
        /// </summary>
        public virtual void Dispose()
        {
-            log.Write(LogLevel.Debug, "Disposing client");
+            _logger.Log(LogLevel.Debug, "Disposing client");
            foreach (var client in ApiClients)
                client.Dispose();
        }
@@ -1,19 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
 using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Requests;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;

 namespace CryptoExchange.Net
 {
@@ -22,469 +9,16 @@ namespace CryptoExchange.Net
    /// </summary>
    public abstract class BaseRestClient : BaseClient, IRestClient
    {
-        /// <summary>
-        /// The factory for creating requests. Used for unit testing
-        /// </summary>
-        public IRequestFactory RequestFactory { get; set; } = new RequestFactory();
-        
        /// <inheritdoc />
        public int TotalRequestsMade => ApiClients.OfType<RestApiClient>().Sum(s => s.TotalRequestsMade);

-        /// <summary>
-        /// Request headers to be sent with each request
-        /// </summary>
-        protected Dictionary<string, string>? StandardRequestHeaders { get; set; }
-
-        /// <summary>
-        /// Client options
-        /// </summary>
-        public new BaseRestClientOptions ClientOptions { get; }
-
        /// <summary>
        /// ctor
        /// </summary>
+        /// <param name="loggerFactory">Logger factory</param>
        /// <param name="name">The name of the API this client is for</param>
-        /// <param name="options">The options for this client</param>
-        protected BaseRestClient(string name, BaseRestClientOptions options) : base(name, options)
+        protected BaseRestClient(ILoggerFactory? loggerFactory, string name) : base(loggerFactory, name)
        {
-            if (options == null)
-                throw new ArgumentNullException(nameof(options));
-
-            ClientOptions = options;
-            RequestFactory.Configure(options.RequestTimeout, options.Proxy, options.HttpClient);
-        }
-
-        /// <inheritdoc />
-        public void SetApiCredentials(ApiCredentials credentials)
-        {
-            foreach (var apiClient in ApiClients)
-                apiClient.SetApiCredentials(credentials);
-        }
-
-        /// <summary>
-        /// Execute a request to the uri and returns if it was successful
-        /// </summary>
-        /// <param name="apiClient">The API client the request is for</param>
-        /// <param name="uri">The uri to send the request to</param>
-        /// <param name="method">The method of the request</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        /// <param name="parameters">The parameters of the request</param>
-        /// <param name="signed">Whether or not the request should be authenticated</param>
-        /// <param name="parameterPosition">Where the parameters should be placed, overwrites the value set in the client</param>
-        /// <param name="arraySerialization">How array parameters should be serialized, overwrites the value set in the client</param>
-        /// <param name="requestWeight">Credits used for the request</param>
-        /// <param name="deserializer">The JsonSerializer to use for deserialization</param>
-        /// <param name="additionalHeaders">Additional headers to send with the request</param>
-        /// <param name="ignoreRatelimit">Ignore rate limits for this request</param>
-        /// <returns></returns>
-        [return: NotNull]
-        protected virtual async Task<WebCallResult> SendRequestAsync(RestApiClient apiClient,
-            Uri uri,
-            HttpMethod method,
-            CancellationToken cancellationToken,
-            Dictionary<string, object>? parameters = null,
-            bool signed = false,
-            HttpMethodParameterPosition? parameterPosition = null,
-            ArrayParametersSerialization? arraySerialization = null,
-            int requestWeight = 1,
-            JsonSerializer? deserializer = null,
-            Dictionary<string, string>? additionalHeaders = null,
-            bool ignoreRatelimit = false)
-        {
-            var request = await PrepareRequestAsync(apiClient, uri, method, cancellationToken, parameters, signed, parameterPosition, arraySerialization, requestWeight, deserializer, additionalHeaders, ignoreRatelimit).ConfigureAwait(false);
-            if (!request)
-                return new WebCallResult(request.Error!);
-
-            var result = await GetResponseAsync<object>(apiClient, request.Data, deserializer, cancellationToken, true).ConfigureAwait(false);
-            return result.AsDataless();
-        }
-
-        /// <summary>
-        /// Execute a request to the uri and deserialize the response into the provided type parameter
-        /// </summary>
-        /// <typeparam name="T">The type to deserialize into</typeparam>
-        /// <param name="apiClient">The API client the request is for</param>
-        /// <param name="uri">The uri to send the request to</param>
-        /// <param name="method">The method of the request</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        /// <param name="parameters">The parameters of the request</param>
-        /// <param name="signed">Whether or not the request should be authenticated</param>
-        /// <param name="parameterPosition">Where the parameters should be placed, overwrites the value set in the client</param>
-        /// <param name="arraySerialization">How array parameters should be serialized, overwrites the value set in the client</param>
-        /// <param name="requestWeight">Credits used for the request</param>
-        /// <param name="deserializer">The JsonSerializer to use for deserialization</param>
-        /// <param name="additionalHeaders">Additional headers to send with the request</param>
-        /// <param name="ignoreRatelimit">Ignore rate limits for this request</param>
-        /// <returns></returns>
-        [return: NotNull]
-        protected virtual async Task<WebCallResult<T>> SendRequestAsync<T>(
-            RestApiClient apiClient,
-            Uri uri, 
-            HttpMethod method, 
-            CancellationToken cancellationToken,            
-            Dictionary<string, object>? parameters = null, 
-            bool signed = false, 
-            HttpMethodParameterPosition? parameterPosition = null,
-            ArrayParametersSerialization? arraySerialization = null, 
-            int requestWeight = 1,
-            JsonSerializer? deserializer = null,
-            Dictionary<string, string>? additionalHeaders = null,
-            bool ignoreRatelimit = false
-            ) where T : class
-        {
-            var request = await PrepareRequestAsync(apiClient, uri, method, cancellationToken, parameters, signed, parameterPosition, arraySerialization, requestWeight, deserializer, additionalHeaders, ignoreRatelimit).ConfigureAwait(false);
-            if (!request)
-                return new WebCallResult<T>(request.Error!);
-
-            return await GetResponseAsync<T>(apiClient, request.Data, deserializer, cancellationToken, false).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Prepares a request to be sent to the server
-        /// </summary>
-        /// <param name="apiClient">The API client the request is for</param>
-        /// <param name="uri">The uri to send the request to</param>
-        /// <param name="method">The method of the request</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        /// <param name="parameters">The parameters of the request</param>
-        /// <param name="signed">Whether or not the request should be authenticated</param>
-        /// <param name="parameterPosition">Where the parameters should be placed, overwrites the value set in the client</param>
-        /// <param name="arraySerialization">How array parameters should be serialized, overwrites the value set in the client</param>
-        /// <param name="requestWeight">Credits used for the request</param>
-        /// <param name="deserializer">The JsonSerializer to use for deserialization</param>
-        /// <param name="additionalHeaders">Additional headers to send with the request</param>
-        /// <param name="ignoreRatelimit">Ignore rate limits for this request</param>
-        /// <returns></returns>
-        protected virtual async Task<CallResult<IRequest>> PrepareRequestAsync(RestApiClient apiClient,
-            Uri uri,
-            HttpMethod method,
-            CancellationToken cancellationToken,
-            Dictionary<string, object>? parameters = null,
-            bool signed = false,
-            HttpMethodParameterPosition? parameterPosition = null,
-            ArrayParametersSerialization? arraySerialization = null,
-            int requestWeight = 1,
-            JsonSerializer? deserializer = null,
-            Dictionary<string, string>? additionalHeaders = null,
-            bool ignoreRatelimit = false)
-        {
-            var requestId = NextId();
-
-            if (signed)
-            {
-                var syncTimeResult = await apiClient.SyncTimeAsync().ConfigureAwait(false);
-                if (!syncTimeResult)
-                {
-                    log.Write(LogLevel.Debug, $"[{requestId}] Failed to sync time, aborting request: " + syncTimeResult.Error);
-                    return syncTimeResult.As<IRequest>(default);
-                }
-            }
-
-            if (!ignoreRatelimit)
-            {
-                foreach (var limiter in apiClient.RateLimiters)
-                {
-                    var limitResult = await limiter.LimitRequestAsync(log, uri.AbsolutePath, method, signed, apiClient.Options.ApiCredentials?.Key, apiClient.Options.RateLimitingBehaviour, requestWeight, cancellationToken).ConfigureAwait(false);
-                    if (!limitResult.Success)
-                        return new CallResult<IRequest>(limitResult.Error!);
-                }
-            }
-
-            if (signed && apiClient.AuthenticationProvider == null)
-            {
-                log.Write(LogLevel.Warning, $"[{requestId}] Request {uri.AbsolutePath} failed because no ApiCredentials were provided");
-                return new CallResult<IRequest>(new NoApiCredentialsError());
-            }
-
-            log.Write(LogLevel.Information, $"[{requestId}] Creating request for " + uri);
-            var paramsPosition = parameterPosition ?? apiClient.ParameterPositions[method];
-            var request = ConstructRequest(apiClient, uri, method, parameters, signed, paramsPosition, arraySerialization ?? apiClient.arraySerialization, requestId, additionalHeaders);
-
-            string? paramString = "";
-            if (paramsPosition == HttpMethodParameterPosition.InBody)
-                paramString = $" with request body '{request.Content}'";
-
-            var headers = request.GetHeaders();
-            if (headers.Any())
-                paramString += " with headers " + string.Join(", ", headers.Select(h => h.Key + $"=[{string.Join(",", h.Value)}]"));
-
-            apiClient.TotalRequestsMade++;
-            log.Write(LogLevel.Trace, $"[{requestId}] Sending {method}{(signed ? " signed" : "")} request to {request.Uri}{paramString ?? " "}{(ClientOptions.Proxy == null ? "" : $" via proxy {ClientOptions.Proxy.Host}")}");
-            return new CallResult<IRequest>(request);
-        }
-
-
-
-        /// <summary>
-        /// Executes the request and returns the result deserialized into the type parameter class
-        /// </summary>
-        /// <param name="apiClient">The client making the request</param>
-        /// <param name="request">The request object to execute</param>
-        /// <param name="deserializer">The JsonSerializer to use for deserialization</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        /// <param name="expectedEmptyResponse">If an empty response is expected</param>
-        /// <returns></returns>
-        protected virtual async Task<WebCallResult<T>> GetResponseAsync<T>(
-            BaseApiClient apiClient, 
-            IRequest request, 
-            JsonSerializer? deserializer, 
-            CancellationToken cancellationToken,
-            bool expectedEmptyResponse)
-        {
-            try
-            {
-                var sw = Stopwatch.StartNew();
-                var response = await request.GetResponseAsync(cancellationToken).ConfigureAwait(false);
-                sw.Stop();
-                var statusCode = response.StatusCode;
-                var headers = response.ResponseHeaders;
-                var responseStream = await response.GetResponseStreamAsync().ConfigureAwait(false);
-                if (response.IsSuccessStatusCode)
-                {
-                    // If we have to manually parse error responses (can't rely on HttpStatusCode) we'll need to read the full
-                    // response before being able to deserialize it into the resulting type since we don't know if it an error response or data
-                    if (apiClient.manualParseError)
-                    {
-                        using var reader = new StreamReader(responseStream);
-                        var data = await reader.ReadToEndAsync().ConfigureAwait(false);
-                        responseStream.Close();
-                        response.Close();
-                        log.Write(LogLevel.Debug, $"[{request.RequestId}] Response received in {sw.ElapsedMilliseconds}ms{(log.Level == LogLevel.Trace ? (": "+data): "")}");
-
-                        if (!expectedEmptyResponse)
-                        {
-                            // Validate if it is valid json. Sometimes other data will be returned, 502 error html pages for example
-                            var parseResult = ValidateJson(data);
-                            if (!parseResult.Success)
-                                return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, ClientOptions.OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, parseResult.Error!);
-
-                            // Let the library implementation see if it is an error response, and if so parse the error
-                            var error = await TryParseErrorAsync(parseResult.Data).ConfigureAwait(false);
-                            if (error != null)
-                                return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, ClientOptions.OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, error!);
-
-                            // Not an error, so continue deserializing
-                            var deserializeResult = Deserialize<T>(parseResult.Data, deserializer, request.RequestId);
-                            return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, ClientOptions.OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), deserializeResult.Data, deserializeResult.Error);
-                        }
-                        else
-                        {
-                            if (!string.IsNullOrEmpty(data))
-                            {
-                                var parseResult = ValidateJson(data);
-                                if (!parseResult.Success)
-                                    // Not empty, and not json
-                                    return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, ClientOptions.OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, parseResult.Error!);
-
-                                var error = await TryParseErrorAsync(parseResult.Data).ConfigureAwait(false);
-                                if (error != null)
-                                    // Error response
-                                    return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, ClientOptions.OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, error!);
-                            }
-
-                            // Empty success response; okay
-                            return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, ClientOptions.OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, default);
-                        }
-                    }
-                    else
-                    {
-                        if (expectedEmptyResponse)
-                        {
-                            // We expected an empty response and the request is successful and don't manually parse errors, so assume it's correct
-                            responseStream.Close();
-                            response.Close();
-
-                            return new WebCallResult<T>(statusCode, headers, sw.Elapsed, null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, null);
-                        }
-
-                        // Success status code, and we don't have to check for errors. Continue deserializing directly from the stream
-                        var desResult = await DeserializeAsync<T>(responseStream, deserializer, request.RequestId, sw.ElapsedMilliseconds).ConfigureAwait(false);
-                        responseStream.Close();
-                        response.Close();
-
-                        return new WebCallResult<T>(statusCode, headers, sw.Elapsed, ClientOptions.OutputOriginalData ? desResult.OriginalData : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), desResult.Data, desResult.Error);
-                    }
-                }
-                else
-                {
-                    // Http status code indicates error
-                    using var reader = new StreamReader(responseStream);
-                    var data = await reader.ReadToEndAsync().ConfigureAwait(false);
-                    log.Write(LogLevel.Warning, $"[{request.RequestId}] Error received in {sw.ElapsedMilliseconds}ms: {data}");
-                    responseStream.Close();
-                    response.Close();
-                    var parseResult = ValidateJson(data);
-                    var error = parseResult.Success ? ParseErrorResponse(parseResult.Data) : parseResult.Error!;
-                    if(error.Code == null || error.Code == 0)
-                        error.Code = (int)response.StatusCode;
-                    return new WebCallResult<T>(statusCode, headers, sw.Elapsed, data, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, error);
-                }
-            }
-            catch (HttpRequestException requestException)
-            {
-                // Request exception, can't reach server for instance
-                var exceptionInfo = requestException.ToLogString();
-                log.Write(LogLevel.Warning, $"[{request.RequestId}] Request exception: " + exceptionInfo);
-                return new WebCallResult<T>(null, null, null, null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, new WebError(exceptionInfo));
-            }
-            catch (OperationCanceledException canceledException)
-            {
-                if (cancellationToken != default && canceledException.CancellationToken == cancellationToken)
-                {
-                    // Cancellation token canceled by caller
-                    log.Write(LogLevel.Warning, $"[{request.RequestId}] Request canceled by cancellation token");
-                    return new WebCallResult<T>(null, null, null, null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, new CancellationRequestedError());
-                }
-                else
-                {
-                    // Request timed out
-                    log.Write(LogLevel.Warning, $"[{request.RequestId}] Request timed out: " + canceledException.ToLogString());
-                    return new WebCallResult<T>(null, null, null, null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, new WebError($"[{request.RequestId}] Request timed out"));
-                }
-            }
-        }
-
-        /// <summary>
-        /// Can be used to parse an error even though response status indicates success. Some apis always return 200 OK, even though there is an error.
-        /// When setting manualParseError to true this method will be called for each response to be able to check if the response is an error or not.
-        /// If the response is an error this method should return the parsed error, else it should return null
-        /// </summary>
-        /// <param name="data">Received data</param>
-        /// <returns>Null if not an error, Error otherwise</returns>
-        protected virtual Task<ServerError?> TryParseErrorAsync(JToken data)
-        {
-            return Task.FromResult<ServerError?>(null);
-        }
-
-        /// <summary>
-        /// Creates a request object
-        /// </summary>
-        /// <param name="apiClient">The API client the request is for</param>
-        /// <param name="uri">The uri to send the request to</param>
-        /// <param name="method">The method of the request</param>
-        /// <param name="parameters">The parameters of the request</param>
-        /// <param name="signed">Whether or not the request should be authenticated</param>
-        /// <param name="parameterPosition">Where the parameters should be placed</param>
-        /// <param name="arraySerialization">How array parameters should be serialized</param>
-        /// <param name="requestId">Unique id of a request</param>
-        /// <param name="additionalHeaders">Additional headers to send with the request</param>
-        /// <returns></returns>
-        protected virtual IRequest ConstructRequest(
-            RestApiClient apiClient,
-            Uri uri,
-            HttpMethod method,
-            Dictionary<string, object>? parameters,
-            bool signed,
-            HttpMethodParameterPosition parameterPosition,
-            ArrayParametersSerialization arraySerialization,
-            int requestId,
-            Dictionary<string, string>? additionalHeaders)
-        {
-            parameters ??= new Dictionary<string, object>();
-
-            for (var i = 0; i< parameters.Count; i++)
-            {
-                var kvp = parameters.ElementAt(i);
-                if (kvp.Value is Func<object> delegateValue)
-                    parameters[kvp.Key] = delegateValue();
-            }
-
-            if (parameterPosition == HttpMethodParameterPosition.InUri)
-            {
-                foreach (var parameter in parameters)
-                    uri = uri.AddQueryParmeter(parameter.Key, parameter.Value.ToString());
-            }
-
-            var headers = new Dictionary<string, string>();
-            var uriParameters = parameterPosition == HttpMethodParameterPosition.InUri ? new SortedDictionary<string, object>(parameters) : new SortedDictionary<string, object>();
-            var bodyParameters = parameterPosition == HttpMethodParameterPosition.InBody ? new SortedDictionary<string, object>(parameters) : new SortedDictionary<string, object>();
-            if (apiClient.AuthenticationProvider != null)
-                apiClient.AuthenticationProvider.AuthenticateRequest(
-                    apiClient, 
-                    uri, 
-                    method, 
-                    parameters, 
-                    signed, 
-                    arraySerialization,
-                    parameterPosition,
-                    out uriParameters, 
-                    out bodyParameters, 
-                    out headers);
-                 
-            // Sanity check
-            foreach(var param in parameters)
-            {
-                if (!uriParameters.ContainsKey(param.Key) && !bodyParameters.ContainsKey(param.Key))
-                    throw new Exception($"Missing parameter {param.Key} after authentication processing. AuthenticationProvider implementation " +
-                        $"should return provided parameters in either the uri or body parameters output");
-            }
-
-            // Add the auth parameters to the uri, start with a new URI to be able to sort the parameters including the auth parameters            
-            uri = uri.SetParameters(uriParameters, arraySerialization);
-        
-            var request = RequestFactory.Create(method, uri, requestId);
-            request.Accept = Constants.JsonContentHeader;
-
-            foreach (var header in headers)
-                request.AddHeader(header.Key, header.Value);
-
-            if (additionalHeaders != null)
-            {
-                foreach (var header in additionalHeaders)
-                    request.AddHeader(header.Key, header.Value);
-            }
-
-            if (StandardRequestHeaders != null)
-            {
-                foreach (var header in StandardRequestHeaders)
-                    // Only add it if it isn't overwritten
-                    if (additionalHeaders?.ContainsKey(header.Key) != true)
-                        request.AddHeader(header.Key, header.Value);
-            }
-
-            if (parameterPosition == HttpMethodParameterPosition.InBody)
-            {
-                var contentType = apiClient.requestBodyFormat == RequestBodyFormat.Json ? Constants.JsonContentHeader : Constants.FormContentHeader;
-                if (bodyParameters.Any())
-                    WriteParamBody(apiClient, request, bodyParameters, contentType);
-                else
-                    request.SetContent(apiClient.requestBodyEmptyContent, contentType);
-            }
-
-            return request;
-        }
-
-        /// <summary>
-        /// Writes the parameters of the request to the request object body
-        /// </summary>
-        /// <param name="apiClient">The client making the request</param>
-        /// <param name="request">The request to set the parameters on</param>
-        /// <param name="parameters">The parameters to set</param>
-        /// <param name="contentType">The content type of the data</param>
-        protected virtual void WriteParamBody(BaseApiClient apiClient, IRequest request, SortedDictionary<string, object> parameters, string contentType)
-        {
-            if (apiClient.requestBodyFormat == RequestBodyFormat.Json)
-            {
-                // Write the parameters as json in the body
-                var stringData = JsonConvert.SerializeObject(parameters);
-                request.SetContent(stringData, contentType);
-            }
-            else if (apiClient.requestBodyFormat == RequestBodyFormat.FormData)
-            {
-                // Write the parameters as form data in the body
-                var stringData = parameters.ToFormData();
-                request.SetContent(stringData, contentType);
-            }
-        }
-
-        /// <summary>
-        /// Parse an error response from the server. Only used when server returns a status other than Success(200)
-        /// </summary>
-        /// <param name="error">The string the request returned</param>
-        /// <returns></returns>
-        protected virtual Error ParseErrorResponse(JToken error)
-        {
-            return new ServerError(error.ToString());
        }
    }
 }
@@ -1,18 +1,11 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Net.WebSockets;
-using System.Threading;
+using System.Text;
 using System.Threading.Tasks;
-using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Sockets;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;

 namespace CryptoExchange.Net
 {
@@ -22,617 +15,27 @@ namespace CryptoExchange.Net
    public abstract class BaseSocketClient: BaseClient, ISocketClient
    {
        #region fields
-        /// <summary>
-        /// The factory for creating sockets. Used for unit testing
-        /// </summary>
-        public IWebsocketFactory SocketFactory { get; set; } = new WebsocketFactory();
-
-        /// <summary>
-        /// List of socket connections currently connecting/connected
-        /// </summary>
-        protected internal ConcurrentDictionary<int, SocketConnection> socketConnections = new();
-        /// <summary>
-        /// Semaphore used while creating sockets
-        /// </summary>
-        protected internal readonly SemaphoreSlim semaphoreSlim = new(1);
-        /// <summary>
-        /// The max amount of concurrent socket connections
-        /// </summary>
-        protected int MaxSocketConnections { get; set; } = 9999;        
-        /// <summary>
-        /// Delegate used for processing byte data received from socket connections before it is processed by handlers
-        /// </summary>
-        protected Func<byte[], string>? dataInterpreterBytes;
-        /// <summary>
-        /// Delegate used for processing string data received from socket connections before it is processed by handlers
-        /// </summary>
-        protected Func<string, string>? dataInterpreterString;
-        /// <summary>
-        /// Handlers for data from the socket which doesn't need to be forwarded to the caller. Ping or welcome messages for example.
-        /// </summary>
-        protected Dictionary<string, Action<MessageEvent>> genericHandlers = new();
-        /// <summary>
-        /// The task that is sending periodic data on the websocket. Can be used for sending Ping messages every x seconds or similair. Not necesarry.
-        /// </summary>
-        protected Task? periodicTask;
-        /// <summary>
-        /// Wait event for the periodicTask
-        /// </summary>
-        protected AsyncResetEvent? periodicEvent;
+        
        /// <summary>
        /// If client is disposing
        /// </summary>
-        protected bool disposing;
-
-        /// <summary>
-        /// If true; data which is a response to a query will also be distributed to subscriptions
-        /// If false; data which is a response to a query won't get forwarded to subscriptions as well
-        /// </summary>
-        protected internal bool ContinueOnQueryResponse { get; protected set; }
-
-        /// <summary>
-        /// If a message is received on the socket which is not handled by a handler this boolean determines whether this logs an error message
-        /// </summary>
-        protected internal bool UnhandledMessageExpected { get; set; }
-
-        /// <summary>
-        /// The max amount of outgoing messages per socket per second
-        /// </summary>
-        protected internal int? RateLimitPerSocketPerSecond { get; set; }
-
+        protected bool _disposing;
+        
        /// <inheritdoc />
-        public double IncomingKbps
-        {
-            get
-            {
-                if (!socketConnections.Any())
-                    return 0;
-
-                return socketConnections.Sum(s => s.Value.IncomingKbps);
-            }
-        }
-
-        /// <summary>
-        /// Client options
-        /// </summary>
-        public new BaseSocketClientOptions ClientOptions { get; }
-
+        public int CurrentConnections => ApiClients.OfType<SocketApiClient>().Sum(c => c.CurrentConnections);
+        /// <inheritdoc />
+        public int CurrentSubscriptions => ApiClients.OfType<SocketApiClient>().Sum(s => s.CurrentSubscriptions);
+        /// <inheritdoc />
+        public double IncomingKbps => ApiClients.OfType<SocketApiClient>().Sum(s => s.IncomingKbps);
        #endregion

        /// <summary>
        /// ctor
        /// </summary>
+        /// <param name="logger">Logger</param>
        /// <param name="name">The name of the API this client is for</param>
-        /// <param name="options">The options for this client</param>
-        protected BaseSocketClient(string name, BaseSocketClientOptions options) : base(name, options)
+        protected BaseSocketClient(ILoggerFactory? logger, string name) : base(logger, name)
        {
-            if (options == null)
-                throw new ArgumentNullException(nameof(options));
-
-            ClientOptions = options;
-        }
-
-        /// <inheritdoc />
-        public void SetApiCredentials(ApiCredentials credentials)
-        {
-            foreach (var apiClient in ApiClients)
-                apiClient.SetApiCredentials(credentials);
-        }
-
-        /// <summary>
-        /// Set a delegate to be used for processing data received from socket connections before it is processed by handlers
-        /// </summary>
-        /// <param name="byteHandler">Handler for byte data</param>
-        /// <param name="stringHandler">Handler for string data</param>
-        protected void SetDataInterpreter(Func<byte[], string>? byteHandler, Func<string, string>? stringHandler)
-        {
-            dataInterpreterBytes = byteHandler;
-            dataInterpreterString = stringHandler;
-        }
-
-        /// <summary>
-        /// Connect to an url and listen for data on the BaseAddress
-        /// </summary>
-        /// <typeparam name="T">The type of the expected data</typeparam>
-        /// <param name="apiClient">The API client the subscription is for</param>
-        /// <param name="request">The optional request object to send, will be serialized to json</param>
-        /// <param name="identifier">The identifier to use, necessary if no request object is sent</param>
-        /// <param name="authenticated">If the subscription is to an authenticated endpoint</param>
-        /// <param name="dataHandler">The handler of update data</param>
-        /// <param name="ct">Cancellation token for closing this subscription</param>
-        /// <returns></returns>
-        protected virtual Task<CallResult<UpdateSubscription>> SubscribeAsync<T>(SocketApiClient apiClient, object? request, string? identifier, bool authenticated, Action<DataEvent<T>> dataHandler, CancellationToken ct)
-        {
-            return SubscribeAsync(apiClient, apiClient.Options.BaseAddress, request, identifier, authenticated, dataHandler, ct);
-        }
-
-        /// <summary>
-        /// Connect to an url and listen for data
-        /// </summary>
-        /// <typeparam name="T">The type of the expected data</typeparam>
-        /// <param name="apiClient">The API client the subscription is for</param>
-        /// <param name="url">The URL to connect to</param>
-        /// <param name="request">The optional request object to send, will be serialized to json</param>
-        /// <param name="identifier">The identifier to use, necessary if no request object is sent</param>
-        /// <param name="authenticated">If the subscription is to an authenticated endpoint</param>
-        /// <param name="dataHandler">The handler of update data</param>
-        /// <param name="ct">Cancellation token for closing this subscription</param>
-        /// <returns></returns>
-        protected virtual async Task<CallResult<UpdateSubscription>> SubscribeAsync<T>(SocketApiClient apiClient, string url, object? request, string? identifier, bool authenticated, Action<DataEvent<T>> dataHandler, CancellationToken ct)
-        {
-            if (disposing)
-                return new CallResult<UpdateSubscription>(new InvalidOperationError("Client disposed, can't subscribe"));
-
-            SocketConnection socketConnection;
-            SocketSubscription subscription;
-            var released = false;
-            // Wait for a semaphore here, so we only connect 1 socket at a time.
-            // This is necessary for being able to see if connections can be combined
-            try
-            {
-                await semaphoreSlim.WaitAsync(ct).ConfigureAwait(false);
-            }
-            catch (OperationCanceledException)
-            {
-                return new CallResult<UpdateSubscription>(new CancellationRequestedError());
-            }
-
-            try
-            {
-                // Get a new or existing socket connection
-                socketConnection = GetSocketConnection(apiClient, url, authenticated);
-
-                // Add a subscription on the socket connection
-                subscription = AddSubscription(request, identifier, true, socketConnection, dataHandler);
-                if (ClientOptions.SocketSubscriptionsCombineTarget == 1)
-                {
-                    // Only 1 subscription per connection, so no need to wait for connection since a new subscription will create a new connection anyway
-                    semaphoreSlim.Release();
-                    released = true;
-                }
-
-                var needsConnecting = !socketConnection.Connected;
-
-                var connectResult = await ConnectIfNeededAsync(socketConnection, authenticated).ConfigureAwait(false);
-                if (!connectResult)
-                    return new CallResult<UpdateSubscription>(connectResult.Error!);
-            }
-            finally
-            {
-                if(!released)
-                    semaphoreSlim.Release();
-            }
-
-            if (socketConnection.PausedActivity)
-            {
-                log.Write(LogLevel.Warning, $"Socket {socketConnection.SocketId} has been paused, can't subscribe at this moment");
-                return new CallResult<UpdateSubscription>( new ServerError("Socket is paused"));
-            }
-
-            if (request != null)
-            {
-                // Send the request and wait for answer
-                var subResult = await SubscribeAndWaitAsync(socketConnection, request, subscription).ConfigureAwait(false);
-                if (!subResult)
-                {
-                    await socketConnection.CloseAsync(subscription).ConfigureAwait(false);
-                    return new CallResult<UpdateSubscription>(subResult.Error!);
-                }
-            }
-            else
-            {
-                // No request to be sent, so just mark the subscription as comfirmed
-                subscription.Confirmed = true;
-            }
-
-            socketConnection.ShouldReconnect = true;
-            if (ct != default)
-            {
-                subscription.CancellationTokenRegistration = ct.Register(async () =>
-                {
-                    log.Write(LogLevel.Information, $"Socket {socketConnection.SocketId} Cancellation token set, closing subscription");
-                    await socketConnection.CloseAsync(subscription).ConfigureAwait(false);
-                }, false);
-            }
-
-            log.Write(LogLevel.Information, $"Socket {socketConnection.SocketId} subscription completed");
-            return new CallResult<UpdateSubscription>(new UpdateSubscription(socketConnection, subscription));
-        }
-
-        /// <summary>
-        /// Sends the subscribe request and waits for a response to that request
-        /// </summary>
-        /// <param name="socketConnection">The connection to send the request on</param>
-        /// <param name="request">The request to send, will be serialized to json</param>
-        /// <param name="subscription">The subscription the request is for</param>
-        /// <returns></returns>
-        protected internal virtual async Task<CallResult<bool>> SubscribeAndWaitAsync(SocketConnection socketConnection, object request, SocketSubscription subscription)
-        {
-            CallResult<object>? callResult = null;
-            await socketConnection.SendAndWaitAsync(request, ClientOptions.SocketResponseTimeout, data => HandleSubscriptionResponse(socketConnection, subscription, request, data, out callResult)).ConfigureAwait(false);
-
-            if (callResult?.Success == true)
-            {
-                subscription.Confirmed = true;
-                return new CallResult<bool>(true);
-            }
-
-            if(callResult== null)
-                return new CallResult<bool>(new ServerError("No response on subscription request received"));
-
-            return new CallResult<bool>(callResult.Error!);
-        }
-
-        /// <summary>
-        /// Send a query on a socket connection to the BaseAddress and wait for the response
-        /// </summary>
-        /// <typeparam name="T">Expected result type</typeparam>
-        /// <param name="apiClient">The API client the query is for</param>
-        /// <param name="request">The request to send, will be serialized to json</param>
-        /// <param name="authenticated">If the query is to an authenticated endpoint</param>
-        /// <returns></returns>
-        protected virtual Task<CallResult<T>> QueryAsync<T>(SocketApiClient apiClient, object request, bool authenticated)
-        {
-            return QueryAsync<T>(apiClient, apiClient.Options.BaseAddress, request, authenticated);
-        }
-
-        /// <summary>
-        /// Send a query on a socket connection and wait for the response
-        /// </summary>
-        /// <typeparam name="T">The expected result type</typeparam>
-        /// <param name="apiClient">The API client the query is for</param>
-        /// <param name="url">The url for the request</param>
-        /// <param name="request">The request to send</param>
-        /// <param name="authenticated">Whether the socket should be authenticated</param>
-        /// <returns></returns>
-        protected virtual async Task<CallResult<T>> QueryAsync<T>(SocketApiClient apiClient, string url, object request, bool authenticated)
-        {
-            if (disposing)
-                return new CallResult<T>(new InvalidOperationError("Client disposed, can't query"));
-
-            SocketConnection socketConnection;
-            var released = false;
-            await semaphoreSlim.WaitAsync().ConfigureAwait(false);
-            try
-            {
-                socketConnection = GetSocketConnection(apiClient, url, authenticated);
-                if (ClientOptions.SocketSubscriptionsCombineTarget == 1)
-                {
-                    // Can release early when only a single sub per connection
-                    semaphoreSlim.Release();
-                    released = true;
-                }
-
-                var connectResult = await ConnectIfNeededAsync(socketConnection, authenticated).ConfigureAwait(false);
-                if (!connectResult)
-                    return new CallResult<T>(connectResult.Error!);
-            }
-            finally
-            {
-                //When the task is ready, release the semaphore. It is vital to ALWAYS release the semaphore when we are ready, or else we will end up with a Semaphore that is forever locked.
-                //This is why it is important to do the Release within a try...finally clause; program execution may crash or take a different path, this way you are guaranteed execution
-                if (!released)
-                    semaphoreSlim.Release();
-            }
-
-            if (socketConnection.PausedActivity)
-            {
-                log.Write(LogLevel.Warning, $"Socket {socketConnection.SocketId} has been paused, can't send query at this moment");
-                return new CallResult<T>(new ServerError("Socket is paused"));
-            }
-
-            return await QueryAndWaitAsync<T>(socketConnection, request).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Sends the query request and waits for the result
-        /// </summary>
-        /// <typeparam name="T">The expected result type</typeparam>
-        /// <param name="socket">The connection to send and wait on</param>
-        /// <param name="request">The request to send</param>
-        /// <returns></returns>
-        protected virtual async Task<CallResult<T>> QueryAndWaitAsync<T>(SocketConnection socket, object request)
-        {
-            var dataResult = new CallResult<T>(new ServerError("No response on query received"));
-            await socket.SendAndWaitAsync(request, ClientOptions.SocketResponseTimeout, data =>
-            {
-                if (!HandleQueryResponse<T>(socket, request, data, out var callResult))
-                    return false;
-
-                dataResult = callResult;
-                return true;
-            }).ConfigureAwait(false);
-
-            return dataResult;
-        }
-
-        /// <summary>
-        /// Checks if a socket needs to be connected and does so if needed. Also authenticates on the socket if needed
-        /// </summary>
-        /// <param name="socket">The connection to check</param>
-        /// <param name="authenticated">Whether the socket should authenticated</param>
-        /// <returns></returns>
-        protected virtual async Task<CallResult<bool>> ConnectIfNeededAsync(SocketConnection socket, bool authenticated)
-        {
-            if (socket.Connected)
-                return new CallResult<bool>(true);
-
-            var connectResult = await ConnectSocketAsync(socket).ConfigureAwait(false);
-            if (!connectResult)
-                return new CallResult<bool>(connectResult.Error!);
-
-            if (!authenticated || socket.Authenticated)
-                return new CallResult<bool>(true);
-
-            var result = await AuthenticateSocketAsync(socket).ConfigureAwait(false);
-            if (!result)
-            {
-                await socket.CloseAsync().ConfigureAwait(false);
-                log.Write(LogLevel.Warning, $"Socket {socket.SocketId} authentication failed");
-                result.Error!.Message = "Authentication failed: " + result.Error.Message;
-                return new CallResult<bool>(result.Error);
-            }
-
-            socket.Authenticated = true;
-            return new CallResult<bool>(true);
-        }
-
-        /// <summary>
-        /// The socketConnection received data (the data JToken parameter). The implementation of this method should check if the received data is a response to the query that was send (the request parameter).
-        /// For example; A query is sent in a request message with an Id parameter with value 10. The socket receives data and calls this method to see if the data it received is an
-        /// anwser to any query that was done. The implementation of this method should check if the response.Id == request.Id to see if they match (assuming the api has some sort of Id tracking on messages,
-        /// if not some other method has be implemented to match the messages).
-        /// If the messages match, the callResult out parameter should be set with the deserialized data in the from of (T) and return true.
-        /// </summary>
-        /// <typeparam name="T">The type of response that is expected on the query</typeparam>
-        /// <param name="socketConnection">The socket connection</param>
-        /// <param name="request">The request that a response is awaited for</param>
-        /// <param name="data">The message received from the server</param>
-        /// <param name="callResult">The interpretation (null if message wasn't a response to the request)</param>
-        /// <returns>True if the message was a response to the query</returns>
-        protected internal abstract bool HandleQueryResponse<T>(SocketConnection socketConnection, object request, JToken data, [NotNullWhen(true)]out CallResult<T>? callResult);
-        /// <summary>
-        /// The socketConnection received data (the data JToken parameter). The implementation of this method should check if the received data is a response to the subscription request that was send (the request parameter).
-        /// For example; A subscribe request message is send with an Id parameter with value 10. The socket receives data and calls this method to see if the data it received is an
-        /// anwser to any subscription request that was done. The implementation of this method should check if the response.Id == request.Id to see if they match (assuming the api has some sort of Id tracking on messages,
-        /// if not some other method has be implemented to match the messages).
-        /// If the messages match, the callResult out parameter should be set with the deserialized data in the from of (T) and return true.
-        /// </summary>
-        /// <param name="socketConnection">The socket connection</param>
-        /// <param name="subscription">A subscription that waiting for a subscription response</param>
-        /// <param name="request">The request that the subscription sent</param>
-        /// <param name="data">The message received from the server</param>
-        /// <param name="callResult">The interpretation (null if message wasn't a response to the request)</param>
-        /// <returns>True if the message was a response to the subscription request</returns>
-        protected internal abstract bool HandleSubscriptionResponse(SocketConnection socketConnection, SocketSubscription subscription, object request, JToken data, out CallResult<object>? callResult);
-        /// <summary>
-        /// Needs to check if a received message matches a handler by request. After subscribing data message will come in. These data messages need to be matched to a specific connection
-        /// to pass the correct data to the correct handler. The implementation of this method should check if the message received matches the subscribe request that was sent.
-        /// </summary>
-        /// <param name="socketConnection">The socket connection the message was recieved on</param>
-        /// <param name="message">The received data</param>
-        /// <param name="request">The subscription request</param>
-        /// <returns>True if the message is for the subscription which sent the request</returns>
-        protected internal abstract bool MessageMatchesHandler(SocketConnection socketConnection, JToken message, object request);
-        /// <summary>
-        /// Needs to check if a received message matches a handler by identifier. Generally used by GenericHandlers. For example; a generic handler is registered which handles ping messages
-        /// from the server. This method should check if the message received is a ping message and the identifer is the identifier of the GenericHandler
-        /// </summary>
-        /// <param name="socketConnection">The socket connection the message was recieved on</param>
-        /// <param name="message">The received data</param>
-        /// <param name="identifier">The string identifier of the handler</param>
-        /// <returns>True if the message is for the handler which has the identifier</returns>
-        protected internal abstract bool MessageMatchesHandler(SocketConnection socketConnection, JToken message, string identifier);
-        /// <summary>
-        /// Needs to authenticate the socket so authenticated queries/subscriptions can be made on this socket connection
-        /// </summary>
-        /// <param name="socketConnection">The socket connection that should be authenticated</param>
-        /// <returns></returns>
-        protected internal abstract Task<CallResult<bool>> AuthenticateSocketAsync(SocketConnection socketConnection);
-        /// <summary>
-        /// Needs to unsubscribe a subscription, typically by sending an unsubscribe request. If multiple subscriptions per socket is not allowed this can just return since the socket will be closed anyway
-        /// </summary>
-        /// <param name="connection">The connection on which to unsubscribe</param>
-        /// <param name="subscriptionToUnsub">The subscription to unsubscribe</param>
-        /// <returns></returns>
-        protected internal abstract Task<bool> UnsubscribeAsync(SocketConnection connection, SocketSubscription subscriptionToUnsub);
-
-        /// <summary>
-        /// Optional handler to interpolate data before sending it to the handlers
-        /// </summary>
-        /// <param name="message"></param>
-        /// <returns></returns>
-        protected internal virtual JToken ProcessTokenData(JToken message)
-
-
-
-        {
-            return message;
-        }
-
-        /// <summary>
-        /// Add a subscription to a connection
-        /// </summary>
-        /// <typeparam name="T">The type of data the subscription expects</typeparam>
-        /// <param name="request">The request of the subscription</param>
-        /// <param name="identifier">The identifier of the subscription (can be null if request param is used)</param>
-        /// <param name="userSubscription">Whether or not this is a user subscription (counts towards the max amount of handlers on a socket)</param>
-        /// <param name="connection">The socket connection the handler is on</param>
-        /// <param name="dataHandler">The handler of the data received</param>
-        /// <returns></returns>
-        protected virtual SocketSubscription AddSubscription<T>(object? request, string? identifier, bool userSubscription, SocketConnection connection, Action<DataEvent<T>> dataHandler)
-        {
-            void InternalHandler(MessageEvent messageEvent)
-            {
-                if (typeof(T) == typeof(string))
-                {
-                    var stringData = (T)Convert.ChangeType(messageEvent.JsonData.ToString(), typeof(T));
-                    dataHandler(new DataEvent<T>(stringData, null, ClientOptions.OutputOriginalData ? messageEvent.OriginalData : null, messageEvent.ReceivedTimestamp));
-                    return;
-                }
-
-                var desResult = Deserialize<T>(messageEvent.JsonData);
-                if (!desResult)
-                {
-                    log.Write(LogLevel.Warning, $"Socket {connection.SocketId} Failed to deserialize data into type {typeof(T)}: {desResult.Error}");
-                    return;
-                }
-
-                dataHandler(new DataEvent<T>(desResult.Data, null, ClientOptions.OutputOriginalData ? messageEvent.OriginalData : null, messageEvent.ReceivedTimestamp));
-            }
-
-            var subscription = request == null
-                ? SocketSubscription.CreateForIdentifier(NextId(), identifier!, userSubscription, InternalHandler)
-                : SocketSubscription.CreateForRequest(NextId(), request, userSubscription, InternalHandler);
-            connection.AddSubscription(subscription);
-            return subscription;
-        }
-
-        /// <summary>
-        /// Adds a generic message handler. Used for example to reply to ping requests
-        /// </summary>
-        /// <param name="identifier">The name of the request handler. Needs to be unique</param>
-        /// <param name="action">The action to execute when receiving a message for this handler (checked by <see cref="MessageMatchesHandler(SocketConnection, Newtonsoft.Json.Linq.JToken,string)"/>)</param>
-        protected void AddGenericHandler(string identifier, Action<MessageEvent> action)
-        {
-            genericHandlers.Add(identifier, action);
-            var subscription = SocketSubscription.CreateForIdentifier(NextId(), identifier, false, action);
-            foreach (var connection in socketConnections.Values)
-                connection.AddSubscription(subscription);
-        }
-
-        /// <summary>
-        /// Gets a connection for a new subscription or query. Can be an existing if there are open position or a new one.
-        /// </summary>
-        /// <param name="apiClient">The API client the connection is for</param>
-        /// <param name="address">The address the socket is for</param>
-        /// <param name="authenticated">Whether the socket should be authenticated</param>
-        /// <returns></returns>
-        protected virtual SocketConnection GetSocketConnection(SocketApiClient apiClient, string address, bool authenticated)
-        {
-            var socketResult = socketConnections.Where(s => s.Value.Uri.ToString().TrimEnd('/') == address.TrimEnd('/')
-                                                  && (s.Value.ApiClient.GetType() == apiClient.GetType())
-                                                  && (s.Value.Authenticated == authenticated || !authenticated) && s.Value.Connected).OrderBy(s => s.Value.SubscriptionCount).FirstOrDefault();
-            var result = socketResult.Equals(default(KeyValuePair<int, SocketConnection>)) ? null : socketResult.Value;
-            if (result != null)
-            {
-                if (result.SubscriptionCount < ClientOptions.SocketSubscriptionsCombineTarget || (socketConnections.Count >= MaxSocketConnections && socketConnections.All(s => s.Value.SubscriptionCount >= ClientOptions.SocketSubscriptionsCombineTarget)))
-                {
-                    // Use existing socket if it has less than target connections OR it has the least connections and we can't make new
-                    return result;
-                }
-            }
-
-            // Create new socket
-            var socket = CreateSocket(address);
-            var socketConnection = new SocketConnection(this, apiClient, socket);
-            socketConnection.UnhandledMessage += HandleUnhandledMessage;
-            foreach (var kvp in genericHandlers)
-            {
-                var handler = SocketSubscription.CreateForIdentifier(NextId(), kvp.Key, false, kvp.Value);
-                socketConnection.AddSubscription(handler);
-            }
-
-            return socketConnection;
-        }
-
-        /// <summary>
-        /// Process an unhandled message
-        /// </summary>
-        /// <param name="token">The token that wasn't processed</param>
-        protected virtual void HandleUnhandledMessage(JToken token)
-        {
-        }
-
-        /// <summary>
-        /// Connect a socket
-        /// </summary>
-        /// <param name="socketConnection">The socket to connect</param>
-        /// <returns></returns>
-        protected virtual async Task<CallResult<bool>> ConnectSocketAsync(SocketConnection socketConnection)
-        {
-            if (await socketConnection.ConnectAsync().ConfigureAwait(false))
-            {
-                socketConnections.TryAdd(socketConnection.SocketId, socketConnection);
-                return new CallResult<bool>(true);
-            }
-
-            socketConnection.Dispose();
-            return new CallResult<bool>(new CantConnectError());
-        }
-
-        /// <summary>
-        /// Create a socket for an address
-        /// </summary>
-        /// <param name="address">The address the socket should connect to</param>
-        /// <returns></returns>
-        protected virtual IWebsocket CreateSocket(string address)
-        {
-            var socket = SocketFactory.CreateWebsocket(log, address);
-            log.Write(LogLevel.Debug, $"Socket {socket.Id} new socket created for " + address);
-
-            if (ClientOptions.Proxy != null)
-                socket.SetProxy(ClientOptions.Proxy);
-
-            socket.Timeout = ClientOptions.SocketNoDataTimeout;
-            socket.DataInterpreterBytes = dataInterpreterBytes;
-            socket.DataInterpreterString = dataInterpreterString;
-            socket.RatelimitPerSecond = RateLimitPerSocketPerSecond;
-            socket.OnError += e =>
-            {
-                if(e is WebSocketException wse)
-                    log.Write(LogLevel.Warning, $"Socket {socket.Id} error: Websocket error code {wse.WebSocketErrorCode}, details: " + e.ToLogString());
-                else
-                    log.Write(LogLevel.Warning, $"Socket {socket.Id} error: " + e.ToLogString());
-            };
-            return socket;
-        }
-
-        /// <summary>
-        /// Periodically sends data over a socket connection
-        /// </summary>
-        /// <param name="identifier">Identifier for the periodic send</param>
-        /// <param name="interval">How often</param>
-        /// <param name="objGetter">Method returning the object to send</param>
-        public virtual void SendPeriodic(string identifier, TimeSpan interval, Func<SocketConnection, object> objGetter)
-        {
-            if (objGetter == null)
-                throw new ArgumentNullException(nameof(objGetter));
-
-            periodicEvent = new AsyncResetEvent();
-            periodicTask = Task.Run(async () =>
-            {
-                while (!disposing)
-                {
-                    await periodicEvent.WaitAsync(interval).ConfigureAwait(false);
-                    if (disposing)
-                        break;
-                    
-                    foreach (var socketConnection in socketConnections.Values)
-                    {
-                        if (disposing)
-                            break;
-
-                        if (!socketConnection.Connected)
-                            continue;
-
-                        var obj = objGetter(socketConnection);
-                        if (obj == null)
-                            continue;
-
-                        log.Write(LogLevel.Trace, $"Socket {socketConnection.SocketId} sending periodic {identifier}");
-
-                        try
-                        {
-                            socketConnection.Send(obj);
-                        }
-                        catch (Exception ex)
-                        {
-                            log.Write(LogLevel.Warning, $"Socket {socketConnection.SocketId} Periodic send {identifier} failed: " + ex.ToLogString());
-                        }
-                    }
-                }
-            });
        }

        /// <summary>
@@ -642,24 +45,12 @@ namespace CryptoExchange.Net
        /// <returns></returns>
        public virtual async Task UnsubscribeAsync(int subscriptionId)
        {
-
-            SocketSubscription? subscription = null;
-            SocketConnection? connection = null;
-            foreach(var socket in socketConnections.Values.ToList())
+            foreach(var socket in ApiClients.OfType<SocketApiClient>())
            {
-                subscription = socket.GetSubscription(subscriptionId);
-                if (subscription != null)
-                {
-                    connection = socket;
-                    break;
-                }
+                var result = await socket.UnsubscribeAsync(subscriptionId).ConfigureAwait(false);
+                if (result)
+                    break;                
            }
-
-            if (subscription == null || connection == null)
-                return;
-
-            log.Write(LogLevel.Information, "Closing subscription " + subscriptionId);
-            await connection.CloseAsync(subscription).ConfigureAwait(false);
        }

        /// <summary>
@@ -672,7 +63,7 @@ namespace CryptoExchange.Net
            if (subscription == null)
                throw new ArgumentNullException(nameof(subscription));

-            log.Write(LogLevel.Information, "Closing subscription " + subscription.Id);
+            _logger.Log(LogLevel.Information, $"Socket {subscription.SocketId} Unsubscribing subscription  " + subscription.Id);
            await subscription.CloseAsync().ConfigureAwait(false);
        }

@@ -682,29 +73,37 @@ namespace CryptoExchange.Net
        /// <returns></returns>
        public virtual async Task UnsubscribeAllAsync()
        {
-            log.Write(LogLevel.Information, $"Closing all {socketConnections.Sum(s => s.Value.SubscriptionCount)} subscriptions");
-            var tasks = new List<Task>();
-            {
-                var socketList = socketConnections.Values;
-                foreach (var sub in socketList)
-                    tasks.Add(sub.CloseAsync());
-            }
-
+            var tasks = new List<Task>();            
+            foreach (var client in ApiClients.OfType<SocketApiClient>())
+                tasks.Add(client.UnsubscribeAllAsync());
+            
            await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
        }

        /// <summary>
-        /// Dispose the client
+        /// Reconnect all connections
        /// </summary>
-        public override void Dispose()
+        /// <returns></returns>
+        public virtual async Task ReconnectAsync()
        {
-            disposing = true;
-            periodicEvent?.Set();
-            periodicEvent?.Dispose();
-            log.Write(LogLevel.Debug, "Disposing socket client, closing all subscriptions");
-            _ = UnsubscribeAllAsync();
-            semaphoreSlim?.Dispose();
-            base.Dispose();
+            _logger.Log(LogLevel.Information, $"Reconnecting all {CurrentConnections} connections");
+            var tasks = new List<Task>();
+            foreach (var client in ApiClients.OfType<SocketApiClient>())
+            {
+                tasks.Add(client.ReconnectAsync());
+            }
+            await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Log the current state of connections and subscriptions
+        /// </summary>
+        public string GetSubscriptionsState()
+        {
+            var result = new StringBuilder();
+            foreach(var client in ApiClients.OfType<SocketApiClient>())            
+                result.AppendLine(client.GetSubscriptionsState());            
+            return result.ToString();
        }
    }
 }
@@ -1,74 +1,561 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Logging;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.Requests;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;

 namespace CryptoExchange.Net
 {
    /// <summary>
    /// Base rest API client for interacting with a REST API
    /// </summary>
-    public abstract class RestApiClient: BaseApiClient
+    public abstract class RestApiClient : BaseApiClient, IRestApiClient
    {
-        /// <summary>
-        /// Get time sync info for an API client
-        /// </summary>
-        /// <returns></returns>
-        protected abstract TimeSyncInfo GetTimeSyncInfo();
-        
-        /// <summary>
-        /// Get time offset for an API client
-        /// </summary>
-        /// <returns></returns>
-        public abstract TimeSpan GetTimeOffset();
+        /// <inheritdoc />
+        public IRequestFactory RequestFactory { get; set; } = new RequestFactory();

-        /// <summary>
-        /// Total amount of requests made with this API client
-        /// </summary>
+        /// <inheritdoc />
+        public abstract TimeSyncInfo? GetTimeSyncInfo();
+
+        /// <inheritdoc />
+        public abstract TimeSpan? GetTimeOffset();
+
+        /// <inheritdoc />
        public int TotalRequestsMade { get; set; }

        /// <summary>
-        /// Options for this client
+        /// Request headers to be sent with each request
        /// </summary>
-        public new RestApiClientOptions Options => (RestApiClientOptions)base.Options;
+        protected Dictionary<string, string>? StandardRequestHeaders { get; set; }

        /// <summary>
        /// List of rate limiters
        /// </summary>
        internal IEnumerable<IRateLimiter> RateLimiters { get; }

+        /// <inheritdoc />
+        public new RestExchangeOptions ClientOptions => (RestExchangeOptions)base.ClientOptions;
+
+        /// <inheritdoc />
+        public new RestApiOptions ApiOptions => (RestApiOptions)base.ApiOptions;
+
        /// <summary>
        /// ctor
        /// </summary>
+        /// <param name="logger">Logger</param>
+        /// <param name="httpClient">HttpClient to use</param>
+        /// <param name="baseAddress">Base address for this API client</param>
        /// <param name="options">The base client options</param>
        /// <param name="apiOptions">The Api client options</param>
-        public RestApiClient(BaseRestClientOptions options, RestApiClientOptions apiOptions): base(options, apiOptions)
+        public RestApiClient(ILogger logger, HttpClient? httpClient, string baseAddress, RestExchangeOptions options, RestApiOptions apiOptions) 
+            : base(logger, 
+                  apiOptions.OutputOriginalData ?? options.OutputOriginalData, 
+                  apiOptions.ApiCredentials ?? options.ApiCredentials,
+                  baseAddress,
+                  options,
+                  apiOptions)
        {
            var rateLimiters = new List<IRateLimiter>();
            foreach (var rateLimiter in apiOptions.RateLimiters)
                rateLimiters.Add(rateLimiter);
            RateLimiters = rateLimiters;
+
+            RequestFactory.Configure(options.Proxy, options.RequestTimeout, httpClient);
+        }
+
+        /// <summary>
+        /// Execute a request to the uri and returns if it was successful
+        /// </summary>
+        /// <param name="uri">The uri to send the request to</param>
+        /// <param name="method">The method of the request</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <param name="parameters">The parameters of the request</param>
+        /// <param name="signed">Whether or not the request should be authenticated</param>
+        /// <param name="parameterPosition">Where the parameters should be placed, overwrites the value set in the client</param>
+        /// <param name="arraySerialization">How array parameters should be serialized, overwrites the value set in the client</param>
+        /// <param name="requestWeight">Credits used for the request</param>
+        /// <param name="deserializer">The JsonSerializer to use for deserialization</param>
+        /// <param name="additionalHeaders">Additional headers to send with the request</param>
+        /// <param name="ignoreRatelimit">Ignore rate limits for this request</param>
+        /// <returns></returns>
+        [return: NotNull]
+        protected virtual async Task<WebCallResult> SendRequestAsync(
+            Uri uri,
+            HttpMethod method,
+            CancellationToken cancellationToken,
+            Dictionary<string, object>? parameters = null,
+            bool signed = false,
+            HttpMethodParameterPosition? parameterPosition = null,
+            ArrayParametersSerialization? arraySerialization = null,
+            int requestWeight = 1,
+            JsonSerializer? deserializer = null,
+            Dictionary<string, string>? additionalHeaders = null,
+            bool ignoreRatelimit = false)
+        {
+            int currentTry = 0;
+            while (true)
+            {
+                currentTry++;
+                var request = await PrepareRequestAsync(uri, method, cancellationToken, parameters, signed, parameterPosition, arraySerialization, requestWeight, deserializer, additionalHeaders, ignoreRatelimit).ConfigureAwait(false);
+                if (!request)
+                    return new WebCallResult(request.Error!);
+
+                var result = await GetResponseAsync<object>(request.Data, deserializer, cancellationToken, true).ConfigureAwait(false);
+                if (await ShouldRetryRequestAsync(result, currentTry).ConfigureAwait(false))
+                    continue;
+
+                return result.AsDataless();
+            }
+        }
+
+        /// <summary>
+        /// Execute a request to the uri and deserialize the response into the provided type parameter
+        /// </summary>
+        /// <typeparam name="T">The type to deserialize into</typeparam>
+        /// <param name="uri">The uri to send the request to</param>
+        /// <param name="method">The method of the request</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <param name="parameters">The parameters of the request</param>
+        /// <param name="signed">Whether or not the request should be authenticated</param>
+        /// <param name="parameterPosition">Where the parameters should be placed, overwrites the value set in the client</param>
+        /// <param name="arraySerialization">How array parameters should be serialized, overwrites the value set in the client</param>
+        /// <param name="requestWeight">Credits used for the request</param>
+        /// <param name="deserializer">The JsonSerializer to use for deserialization</param>
+        /// <param name="additionalHeaders">Additional headers to send with the request</param>
+        /// <param name="ignoreRatelimit">Ignore rate limits for this request</param>
+        /// <returns></returns>
+        [return: NotNull]
+        protected virtual async Task<WebCallResult<T>> SendRequestAsync<T>(
+            Uri uri,
+            HttpMethod method,
+            CancellationToken cancellationToken,
+            Dictionary<string, object>? parameters = null,
+            bool signed = false,
+            HttpMethodParameterPosition? parameterPosition = null,
+            ArrayParametersSerialization? arraySerialization = null,
+            int requestWeight = 1,
+            JsonSerializer? deserializer = null,
+            Dictionary<string, string>? additionalHeaders = null,
+            bool ignoreRatelimit = false
+            ) where T : class
+        {
+            int currentTry = 0;
+            while (true)
+            {
+                currentTry++;
+                var request = await PrepareRequestAsync(uri, method, cancellationToken, parameters, signed, parameterPosition, arraySerialization, requestWeight, deserializer, additionalHeaders, ignoreRatelimit).ConfigureAwait(false);
+                if (!request)
+                    return new WebCallResult<T>(request.Error!);
+
+                var result = await GetResponseAsync<T>(request.Data, deserializer, cancellationToken, false).ConfigureAwait(false);
+                if (await ShouldRetryRequestAsync(result, currentTry).ConfigureAwait(false))
+                    continue;
+
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// Prepares a request to be sent to the server
+        /// </summary>
+        /// <param name="uri">The uri to send the request to</param>
+        /// <param name="method">The method of the request</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <param name="parameters">The parameters of the request</param>
+        /// <param name="signed">Whether or not the request should be authenticated</param>
+        /// <param name="parameterPosition">Where the parameters should be placed, overwrites the value set in the client</param>
+        /// <param name="arraySerialization">How array parameters should be serialized, overwrites the value set in the client</param>
+        /// <param name="requestWeight">Credits used for the request</param>
+        /// <param name="deserializer">The JsonSerializer to use for deserialization</param>
+        /// <param name="additionalHeaders">Additional headers to send with the request</param>
+        /// <param name="ignoreRatelimit">Ignore rate limits for this request</param>
+        /// <returns></returns>
+        protected virtual async Task<CallResult<IRequest>> PrepareRequestAsync(
+            Uri uri,
+            HttpMethod method,
+            CancellationToken cancellationToken,
+            Dictionary<string, object>? parameters = null,
+            bool signed = false,
+            HttpMethodParameterPosition? parameterPosition = null,
+            ArrayParametersSerialization? arraySerialization = null,
+            int requestWeight = 1,
+            JsonSerializer? deserializer = null,
+            Dictionary<string, string>? additionalHeaders = null,
+            bool ignoreRatelimit = false)
+        {
+            var requestId = NextId();
+
+            if (signed)
+            {
+                var syncTask = SyncTimeAsync();
+                var timeSyncInfo = GetTimeSyncInfo();
+
+                if (timeSyncInfo != null && timeSyncInfo.TimeSyncState.LastSyncTime == default)
+                {
+                    // Initially with first request we'll need to wait for the time syncing, if it's not the first request we can just continue
+                    var syncTimeResult = await syncTask.ConfigureAwait(false);
+                    if (!syncTimeResult)
+                    {
+                        _logger.Log(LogLevel.Debug, $"[{requestId}] Failed to sync time, aborting request: " + syncTimeResult.Error);
+                        return syncTimeResult.As<IRequest>(default);
+                    }
+                }
+            }
+
+            if (!ignoreRatelimit)
+            {
+                foreach (var limiter in RateLimiters)
+                {
+                    var limitResult = await limiter.LimitRequestAsync(_logger, uri.AbsolutePath, method, signed, ApiOptions.ApiCredentials?.Key ?? ClientOptions.ApiCredentials?.Key, ApiOptions.RateLimitingBehaviour, requestWeight, cancellationToken).ConfigureAwait(false);
+                    if (!limitResult.Success)
+                        return new CallResult<IRequest>(limitResult.Error!);
+                }
+            }
+
+            if (signed && AuthenticationProvider == null)
+            {
+                _logger.Log(LogLevel.Warning, $"[{requestId}] Request {uri.AbsolutePath} failed because no ApiCredentials were provided");
+                return new CallResult<IRequest>(new NoApiCredentialsError());
+            }
+
+            _logger.Log(LogLevel.Information, $"[{requestId}] Creating request for " + uri);
+            var paramsPosition = parameterPosition ?? ParameterPositions[method];
+            var request = ConstructRequest(uri, method, parameters?.OrderBy(p => p.Key).ToDictionary(p => p.Key, p => p.Value), signed, paramsPosition, arraySerialization ?? this.arraySerialization, requestId, additionalHeaders);
+
+            string? paramString = "";
+            if (paramsPosition == HttpMethodParameterPosition.InBody)
+                paramString = $" with request body '{request.Content}'";
+
+            var headers = request.GetHeaders();
+            if (headers.Any())
+                paramString += " with headers " + string.Join(", ", headers.Select(h => h.Key + $"=[{string.Join(",", h.Value)}]"));
+
+            TotalRequestsMade++;
+            _logger.Log(LogLevel.Trace, $"[{requestId}] Sending {method}{(signed ? " signed" : "")} request to {request.Uri}{paramString ?? " "}");
+            return new CallResult<IRequest>(request);
+        }
+
+        /// <summary>
+        /// Executes the request and returns the result deserialized into the type parameter class
+        /// </summary>
+        /// <param name="request">The request object to execute</param>
+        /// <param name="deserializer">The JsonSerializer to use for deserialization</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <param name="expectedEmptyResponse">If an empty response is expected</param>
+        /// <returns></returns>
+        protected virtual async Task<WebCallResult<T>> GetResponseAsync<T>(
+            IRequest request,
+            JsonSerializer? deserializer,
+            CancellationToken cancellationToken,
+            bool expectedEmptyResponse)
+        {
+            try
+            {
+                var sw = Stopwatch.StartNew();
+                var response = await request.GetResponseAsync(cancellationToken).ConfigureAwait(false);
+                sw.Stop();
+                var statusCode = response.StatusCode;
+                var headers = response.ResponseHeaders;
+                var responseLength = response.ContentLength;
+                var responseStream = await response.GetResponseStreamAsync().ConfigureAwait(false);
+                if (response.IsSuccessStatusCode)
+                {
+                    // If we have to manually parse error responses (can't rely on HttpStatusCode) we'll need to read the full
+                    // response before being able to deserialize it into the resulting type since we don't know if it an error response or data
+                    if (manualParseError)
+                    {
+                        using var reader = new StreamReader(responseStream);
+                        var data = await reader.ReadToEndAsync().ConfigureAwait(false);
+                        responseLength ??= data.Length;
+                        responseStream.Close();
+                        response.Close();
+                        _logger.Log(LogLevel.Debug, $"[{request.RequestId}] Response received in {sw.ElapsedMilliseconds}ms{(OutputOriginalData ? (": " + data) : "")}");
+
+                        if (!expectedEmptyResponse)
+                        {
+                            // Validate if it is valid json. Sometimes other data will be returned, 502 error html pages for example
+                            var parseResult = ValidateJson(data);
+                            if (!parseResult.Success)
+                                return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, parseResult.Error!);
+
+                            // Let the library implementation see if it is an error response, and if so parse the error
+                            var error = await TryParseErrorAsync(parseResult.Data).ConfigureAwait(false);
+                            if (error != null)
+                                return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, error!);
+
+                            // Not an error, so continue deserializing
+                            var deserializeResult = Deserialize<T>(parseResult.Data, deserializer, request.RequestId);
+                            return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), deserializeResult.Data, deserializeResult.Error);
+                        }
+                        else
+                        {
+                            if (!string.IsNullOrEmpty(data))
+                            {
+                                var parseResult = ValidateJson(data);
+                                if (!parseResult.Success)
+                                    // Not empty, and not json
+                                    return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, parseResult.Error!);
+
+                                var error = await TryParseErrorAsync(parseResult.Data).ConfigureAwait(false);
+                                if (error != null)
+                                    // Error response
+                                    return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, error!);
+                            }
+
+                            // Empty success response; okay
+                            return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? data : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, default);
+                        }
+                    }
+                    else
+                    {
+                        if (expectedEmptyResponse)
+                        {
+                            // We expected an empty response and the request is successful and don't manually parse errors, so assume it's correct
+                            responseStream.Close();
+                            response.Close();
+
+                            return new WebCallResult<T>(statusCode, headers, sw.Elapsed, 0, null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, null);
+                        }
+
+                        // Success status code, and we don't have to check for errors. Continue deserializing directly from the stream
+                        var desResult = await DeserializeAsync<T>(responseStream, deserializer, request.RequestId, sw.ElapsedMilliseconds).ConfigureAwait(false);
+                        responseStream.Close();
+                        response.Close();
+
+                        return new WebCallResult<T>(statusCode, headers, sw.Elapsed, responseLength, OutputOriginalData ? desResult.OriginalData : null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), desResult.Data, desResult.Error);
+                    }
+                }
+                else
+                {
+                    // Http status code indicates error
+                    using var reader = new StreamReader(responseStream);
+                    var data = await reader.ReadToEndAsync().ConfigureAwait(false);
+                    _logger.Log(LogLevel.Warning, $"[{request.RequestId}] Error received in {sw.ElapsedMilliseconds}ms: {data}");
+                    responseStream.Close();
+                    response.Close();
+                    var parseResult = ValidateJson(data);
+                    var error = parseResult.Success ? ParseErrorResponse(parseResult.Data) : new ServerError(data)!;
+                    if (error.Code == null || error.Code == 0)
+                        error.Code = (int)response.StatusCode;
+                    return new WebCallResult<T>(statusCode, headers, sw.Elapsed, data.Length, data, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, error);
+                }
+            }
+            catch (HttpRequestException requestException)
+            {
+                // Request exception, can't reach server for instance
+                var exceptionInfo = requestException.ToLogString();
+                _logger.Log(LogLevel.Warning, $"[{request.RequestId}] Request exception: " + exceptionInfo);
+                return new WebCallResult<T>(null, null, null, null, null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, new WebError(exceptionInfo));
+            }
+            catch (OperationCanceledException canceledException)
+            {
+                if (cancellationToken != default && canceledException.CancellationToken == cancellationToken)
+                {
+                    // Cancellation token canceled by caller
+                    _logger.Log(LogLevel.Warning, $"[{request.RequestId}] Request canceled by cancellation token");
+                    return new WebCallResult<T>(null, null, null, null, null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, new CancellationRequestedError());
+                }
+                else
+                {
+                    // Request timed out
+                    _logger.Log(LogLevel.Warning, $"[{request.RequestId}] Request timed out: " + canceledException.ToLogString());
+                    return new WebCallResult<T>(null, null, null, null, null, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, new WebError($"[{request.RequestId}] Request timed out"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Can be used to parse an error even though response status indicates success. Some apis always return 200 OK, even though there is an error.
+        /// When setting manualParseError to true this method will be called for each response to be able to check if the response is an error or not.
+        /// If the response is an error this method should return the parsed error, else it should return null
+        /// </summary>
+        /// <param name="data">Received data</param>
+        /// <returns>Null if not an error, Error otherwise</returns>
+        protected virtual Task<ServerError?> TryParseErrorAsync(JToken data)
+        {
+            return Task.FromResult<ServerError?>(null);
+        }
+
+        /// <summary>
+        /// Can be used to indicate that a request should be retried. Defaults to false. Make sure to retry a max number of times (based on the the tries parameter) or the request will retry forever.
+        /// Note that this is always called; even when the request might be successful
+        /// </summary>
+        /// <typeparam name="T">WebCallResult type parameter</typeparam>
+        /// <param name="callResult">The result of the call</param>
+        /// <param name="tries">The current try number</param>
+        /// <returns>True if call should retry, false if the call should return</returns>
+        protected virtual Task<bool> ShouldRetryRequestAsync<T>(WebCallResult<T> callResult, int tries) => Task.FromResult(false);
+
+        /// <summary>
+        /// Creates a request object
+        /// </summary>
+        /// <param name="uri">The uri to send the request to</param>
+        /// <param name="method">The method of the request</param>
+        /// <param name="parameters">The parameters of the request</param>
+        /// <param name="signed">Whether or not the request should be authenticated</param>
+        /// <param name="parameterPosition">Where the parameters should be placed</param>
+        /// <param name="arraySerialization">How array parameters should be serialized</param>
+        /// <param name="requestId">Unique id of a request</param>
+        /// <param name="additionalHeaders">Additional headers to send with the request</param>
+        /// <returns></returns>
+        protected virtual IRequest ConstructRequest(
+            Uri uri,
+            HttpMethod method,
+            Dictionary<string, object>? parameters,
+            bool signed,
+            HttpMethodParameterPosition parameterPosition,
+            ArrayParametersSerialization arraySerialization,
+            int requestId,
+            Dictionary<string, string>? additionalHeaders)
+        {
+            parameters ??= new Dictionary<string, object>();
+
+            for (var i = 0; i < parameters.Count; i++)
+            {
+                var kvp = parameters.ElementAt(i);
+                if (kvp.Value is Func<object> delegateValue)
+                    parameters[kvp.Key] = delegateValue();
+            }
+
+            if (parameterPosition == HttpMethodParameterPosition.InUri)
+            {
+                foreach (var parameter in parameters)
+                    uri = uri.AddQueryParmeter(parameter.Key, parameter.Value.ToString());
+            }
+
+            var headers = new Dictionary<string, string>();
+            var uriParameters = parameterPosition == HttpMethodParameterPosition.InUri ? new SortedDictionary<string, object>(parameters) : new SortedDictionary<string, object>();
+            var bodyParameters = parameterPosition == HttpMethodParameterPosition.InBody ? new SortedDictionary<string, object>(parameters) : new SortedDictionary<string, object>();
+            if (AuthenticationProvider != null)
+            {
+                try
+                {
+                    AuthenticationProvider.AuthenticateRequest(
+                        this,
+                        uri,
+                        method,
+                        parameters,
+                        signed,
+                        arraySerialization,
+                        parameterPosition,
+                        out uriParameters,
+                        out bodyParameters,
+                        out headers);
+                }
+                catch (Exception ex)
+                {
+                    throw new Exception("Failed to authenticate request, make sure your API credentials are correct", ex);
+                }
+            }
+
+            // Sanity check
+            foreach (var param in parameters)
+            {
+                if (!uriParameters.ContainsKey(param.Key) && !bodyParameters.ContainsKey(param.Key))
+                {
+                    throw new Exception($"Missing parameter {param.Key} after authentication processing. AuthenticationProvider implementation " +
+                        $"should return provided parameters in either the uri or body parameters output");
+                }
+            }
+
+            // Add the auth parameters to the uri, start with a new URI to be able to sort the parameters including the auth parameters            
+            uri = uri.SetParameters(uriParameters, arraySerialization);
+
+            var request = RequestFactory.Create(method, uri, requestId);
+            request.Accept = Constants.JsonContentHeader;
+
+            foreach (var header in headers)
+                request.AddHeader(header.Key, header.Value);
+
+            if (additionalHeaders != null)
+            {
+                foreach (var header in additionalHeaders)
+                    request.AddHeader(header.Key, header.Value);
+            }
+
+            if (StandardRequestHeaders != null)
+            {
+                foreach (var header in StandardRequestHeaders)
+                {
+                    // Only add it if it isn't overwritten
+                    if (additionalHeaders?.ContainsKey(header.Key) != true)
+                        request.AddHeader(header.Key, header.Value);
+                }
+            }
+
+            if (parameterPosition == HttpMethodParameterPosition.InBody)
+            {
+                var contentType = requestBodyFormat == RequestBodyFormat.Json ? Constants.JsonContentHeader : Constants.FormContentHeader;
+                if (bodyParameters.Any())
+                    WriteParamBody(request, bodyParameters, contentType);
+                else
+                    request.SetContent(requestBodyEmptyContent, contentType);
+            }
+
+            return request;
+        }
+
+        /// <summary>
+        /// Writes the parameters of the request to the request object body
+        /// </summary>
+        /// <param name="request">The request to set the parameters on</param>
+        /// <param name="parameters">The parameters to set</param>
+        /// <param name="contentType">The content type of the data</param>
+        protected virtual void WriteParamBody(IRequest request, SortedDictionary<string, object> parameters, string contentType)
+        {
+            if (requestBodyFormat == RequestBodyFormat.Json)
+            {
+                // Write the parameters as json in the body
+                var stringData = JsonConvert.SerializeObject(parameters);
+                request.SetContent(stringData, contentType);
+            }
+            else if (requestBodyFormat == RequestBodyFormat.FormData)
+            {
+                // Write the parameters as form data in the body
+                var stringData = parameters.ToFormData();
+                request.SetContent(stringData, contentType);
+            }
+        }
+
+        /// <summary>
+        /// Parse an error response from the server. Only used when server returns a status other than Success(200)
+        /// </summary>
+        /// <param name="error">The string the request returned</param>
+        /// <returns></returns>
+        protected virtual Error ParseErrorResponse(JToken error)
+        {
+            return new ServerError(error.ToString());
        }

        /// <summary>
        /// Retrieve the server time for the purpose of syncing time between client and server to prevent authentication issues
        /// </summary>
        /// <returns>Server time</returns>
-        protected abstract Task<WebCallResult<DateTime>> GetServerTimestampAsync();
+        protected virtual Task<WebCallResult<DateTime>> GetServerTimestampAsync() => throw new NotImplementedException();

        internal async Task<WebCallResult<bool>> SyncTimeAsync()
        {
            var timeSyncParams = GetTimeSyncInfo();
+            if (timeSyncParams == null)
+                return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, true, null);
+
            if (await timeSyncParams.TimeSyncState.Semaphore.WaitAsync(0).ConfigureAwait(false))
            {
                if (!timeSyncParams.SyncTime || (DateTime.UtcNow - timeSyncParams.TimeSyncState.LastSyncTime < timeSyncParams.RecalculationInterval))
                {
                    timeSyncParams.TimeSyncState.Semaphore.Release();
-                    return new WebCallResult<bool>(null, null, null, null, null, null, null, null, true, null);
+                    return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, true, null);
                }

                var localTime = DateTime.UtcNow;
@@ -94,10 +581,10 @@ namespace CryptoExchange.Net
                // Calculate time offset between local and server
                var offset = result.Data - (localTime.AddMilliseconds(result.ResponseTime!.Value.TotalMilliseconds / 2));
                timeSyncParams.UpdateTimeOffset(offset);
-                timeSyncParams.TimeSyncState.Semaphore.Release();                
+                timeSyncParams.TimeSyncState.Semaphore.Release();
            }

-            return new WebCallResult<bool>(null, null, null, null, null, null, null, null, true, null);
+            return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, true, null);
        }
    }
 }
@@ -1,19 +1,826 @@
+using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.Sockets;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;

 namespace CryptoExchange.Net
 {
    /// <summary>
    /// Base socket API client for interaction with a websocket API
    /// </summary>
-    public abstract class SocketApiClient : BaseApiClient
+    public abstract class SocketApiClient : BaseApiClient, ISocketApiClient
    {
+        #region Fields
+        /// <inheritdoc/>
+        public IWebsocketFactory SocketFactory { get; set; } = new WebsocketFactory();
+
+        /// <summary>
+        /// List of socket connections currently connecting/connected
+        /// </summary>
+        protected internal ConcurrentDictionary<int, SocketConnection> socketConnections = new();
+
+        /// <summary>
+        /// Semaphore used while creating sockets
+        /// </summary>
+        protected internal readonly SemaphoreSlim semaphoreSlim = new(1);
+
+        /// <summary>
+        /// Keep alive interval for websocket connection
+        /// </summary>
+        protected TimeSpan KeepAliveInterval { get; set; } = TimeSpan.FromSeconds(10);
+
+        /// <summary>
+        /// Delegate used for processing byte data received from socket connections before it is processed by handlers
+        /// </summary>
+        protected Func<byte[], string>? dataInterpreterBytes;
+
+        /// <summary>
+        /// Delegate used for processing string data received from socket connections before it is processed by handlers
+        /// </summary>
+        protected Func<string, string>? dataInterpreterString;
+
+        /// <summary>
+        /// Handlers for data from the socket which doesn't need to be forwarded to the caller. Ping or welcome messages for example.
+        /// </summary>
+        protected Dictionary<string, Action<MessageEvent>> genericHandlers = new();
+
+        /// <summary>
+        /// The task that is sending periodic data on the websocket. Can be used for sending Ping messages every x seconds or similair. Not necesarry.
+        /// </summary>
+        protected Task? periodicTask;
+
+        /// <summary>
+        /// Wait event for the periodicTask
+        /// </summary>
+        protected AsyncResetEvent? periodicEvent;
+
+        /// <summary>
+        /// If true; data which is a response to a query will also be distributed to subscriptions
+        /// If false; data which is a response to a query won't get forwarded to subscriptions as well
+        /// </summary>
+        protected internal bool ContinueOnQueryResponse { get; protected set; }
+
+        /// <summary>
+        /// If a message is received on the socket which is not handled by a handler this boolean determines whether this logs an error message
+        /// </summary>
+        protected internal bool UnhandledMessageExpected { get; set; }
+
+        /// <summary>
+        /// The max amount of outgoing messages per socket per second
+        /// </summary>
+        protected internal int? RateLimitPerSocketPerSecond { get; set; }
+
+        /// <inheritdoc />
+        public double IncomingKbps
+        {
+            get
+            {
+                if (!socketConnections.Any())
+                    return 0;
+
+                return socketConnections.Sum(s => s.Value.IncomingKbps);
+            }
+        }
+
+        /// <inheritdoc />
+        public int CurrentConnections => socketConnections.Count;
+
+        /// <inheritdoc />
+        public int CurrentSubscriptions
+        {
+            get
+            {
+                if (!socketConnections.Any())
+                    return 0;
+
+                return socketConnections.Sum(s => s.Value.SubscriptionCount);
+            }
+        }
+
+
+        /// <inheritdoc />
+        public new SocketExchangeOptions ClientOptions => (SocketExchangeOptions)base.ClientOptions;
+
+        /// <inheritdoc />
+        public new SocketApiOptions ApiOptions => (SocketApiOptions)base.ApiOptions;
+        #endregion
+
        /// <summary>
        /// ctor
        /// </summary>
-        /// <param name="options">The base client options</param>
+        /// <param name="logger">log</param>
+        /// <param name="options">Client options</param>
+        /// <param name="baseAddress">Base address for this API client</param>
        /// <param name="apiOptions">The Api client options</param>
-        public SocketApiClient(BaseClientOptions options, ApiClientOptions apiOptions): base(options, apiOptions)
+        public SocketApiClient(ILogger logger, string baseAddress, SocketExchangeOptions options, SocketApiOptions apiOptions) 
+            : base(logger, 
+                  apiOptions.OutputOriginalData ?? options.OutputOriginalData,
+                  apiOptions.ApiCredentials ?? options.ApiCredentials,
+                  baseAddress,
+                  options,
+                  apiOptions)
        {
        }
+
+        /// <summary>
+        /// Set a delegate to be used for processing data received from socket connections before it is processed by handlers
+        /// </summary>
+        /// <param name="byteHandler">Handler for byte data</param>
+        /// <param name="stringHandler">Handler for string data</param>
+        protected void SetDataInterpreter(Func<byte[], string>? byteHandler, Func<string, string>? stringHandler)
+        {
+            dataInterpreterBytes = byteHandler;
+            dataInterpreterString = stringHandler;
+        }
+
+        /// <summary>
+        /// Connect to an url and listen for data on the BaseAddress
+        /// </summary>
+        /// <typeparam name="T">The type of the expected data</typeparam>
+        /// <param name="request">The optional request object to send, will be serialized to json</param>
+        /// <param name="identifier">The identifier to use, necessary if no request object is sent</param>
+        /// <param name="authenticated">If the subscription is to an authenticated endpoint</param>
+        /// <param name="dataHandler">The handler of update data</param>
+        /// <param name="ct">Cancellation token for closing this subscription</param>
+        /// <returns></returns>
+        protected virtual Task<CallResult<UpdateSubscription>> SubscribeAsync<T>(object? request, string? identifier, bool authenticated, Action<DataEvent<T>> dataHandler, CancellationToken ct)
+        {
+            return SubscribeAsync(BaseAddress, request, identifier, authenticated, dataHandler, ct);
+        }
+
+        /// <summary>
+        /// Connect to an url and listen for data
+        /// </summary>
+        /// <typeparam name="T">The type of the expected data</typeparam>
+        /// <param name="url">The URL to connect to</param>
+        /// <param name="request">The optional request object to send, will be serialized to json</param>
+        /// <param name="identifier">The identifier to use, necessary if no request object is sent</param>
+        /// <param name="authenticated">If the subscription is to an authenticated endpoint</param>
+        /// <param name="dataHandler">The handler of update data</param>
+        /// <param name="ct">Cancellation token for closing this subscription</param>
+        /// <returns></returns>
+        protected virtual async Task<CallResult<UpdateSubscription>> SubscribeAsync<T>(string url, object? request, string? identifier, bool authenticated, Action<DataEvent<T>> dataHandler, CancellationToken ct)
+        {
+            if (_disposing)
+                return new CallResult<UpdateSubscription>(new InvalidOperationError("Client disposed, can't subscribe"));
+
+            SocketConnection socketConnection;
+            SocketSubscription? subscription;
+            var released = false;
+            // Wait for a semaphore here, so we only connect 1 socket at a time.
+            // This is necessary for being able to see if connections can be combined
+            try
+            {
+                await semaphoreSlim.WaitAsync(ct).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                return new CallResult<UpdateSubscription>(new CancellationRequestedError());
+            }
+
+            try
+            {
+                while (true)
+                {
+                    // Get a new or existing socket connection
+                    var socketResult = await GetSocketConnection(url, authenticated).ConfigureAwait(false);
+                    if (!socketResult)
+                        return socketResult.As<UpdateSubscription>(null);
+
+                    socketConnection = socketResult.Data;
+
+                    // Add a subscription on the socket connection
+                    subscription = AddSubscription(request, identifier, true, socketConnection, dataHandler, authenticated);
+                    if (subscription == null)
+                    {
+                        _logger.Log(LogLevel.Trace, $"Socket {socketConnection.SocketId} failed to add subscription, retrying on different connection");
+                        continue;
+                    }
+
+                    if (ClientOptions.SocketSubscriptionsCombineTarget == 1)
+                    {
+                        // Only 1 subscription per connection, so no need to wait for connection since a new subscription will create a new connection anyway
+                        semaphoreSlim.Release();
+                        released = true;
+                    }
+
+                    var needsConnecting = !socketConnection.Connected;
+
+                    var connectResult = await ConnectIfNeededAsync(socketConnection, authenticated).ConfigureAwait(false);
+                    if (!connectResult)
+                        return new CallResult<UpdateSubscription>(connectResult.Error!);
+
+                    break;
+                }
+            }
+            finally
+            {
+                if (!released)
+                    semaphoreSlim.Release();
+            }
+
+            if (socketConnection.PausedActivity)
+            {
+                _logger.Log(LogLevel.Warning, $"Socket {socketConnection.SocketId} has been paused, can't subscribe at this moment");
+                return new CallResult<UpdateSubscription>(new ServerError("Socket is paused"));
+            }
+
+            if (request != null)
+            {
+                // Send the request and wait for answer
+                var subResult = await SubscribeAndWaitAsync(socketConnection, request, subscription).ConfigureAwait(false);
+                if (!subResult)
+                {
+                    _logger.Log(LogLevel.Warning, $"Socket {socketConnection.SocketId} failed to subscribe: {subResult.Error}");
+                    await socketConnection.CloseAsync(subscription).ConfigureAwait(false);
+                    return new CallResult<UpdateSubscription>(subResult.Error!);
+                }
+            }
+            else
+            {
+                // No request to be sent, so just mark the subscription as comfirmed
+                subscription.Confirmed = true;
+            }
+
+            if (ct != default)
+            {
+                subscription.CancellationTokenRegistration = ct.Register(async () =>
+                {
+                    _logger.Log(LogLevel.Information, $"Socket {socketConnection.SocketId} Cancellation token set, closing subscription");
+                    await socketConnection.CloseAsync(subscription).ConfigureAwait(false);
+                }, false);
+            }
+
+            _logger.Log(LogLevel.Information, $"Socket {socketConnection.SocketId} subscription {subscription.Id} completed successfully");
+            return new CallResult<UpdateSubscription>(new UpdateSubscription(socketConnection, subscription));
+        }
+
+        /// <summary>
+        /// Sends the subscribe request and waits for a response to that request
+        /// </summary>
+        /// <param name="socketConnection">The connection to send the request on</param>
+        /// <param name="request">The request to send, will be serialized to json</param>
+        /// <param name="subscription">The subscription the request is for</param>
+        /// <returns></returns>
+        protected internal virtual async Task<CallResult<bool>> SubscribeAndWaitAsync(SocketConnection socketConnection, object request, SocketSubscription subscription)
+        {
+            CallResult<object>? callResult = null;
+            await socketConnection.SendAndWaitAsync(request, ClientOptions.RequestTimeout, subscription, data => HandleSubscriptionResponse(socketConnection, subscription, request, data, out callResult)).ConfigureAwait(false);
+
+            if (callResult?.Success == true)
+            {
+                subscription.Confirmed = true;
+                return new CallResult<bool>(true);
+            }
+
+            if (callResult == null)
+                return new CallResult<bool>(new ServerError("No response on subscription request received"));
+
+            return new CallResult<bool>(callResult.Error!);
+        }
+
+        /// <summary>
+        /// Send a query on a socket connection to the BaseAddress and wait for the response
+        /// </summary>
+        /// <typeparam name="T">Expected result type</typeparam>
+        /// <param name="request">The request to send, will be serialized to json</param>
+        /// <param name="authenticated">If the query is to an authenticated endpoint</param>
+        /// <returns></returns>
+        protected virtual Task<CallResult<T>> QueryAsync<T>(object request, bool authenticated)
+        {
+            return QueryAsync<T>(BaseAddress, request, authenticated);
+        }
+
+        /// <summary>
+        /// Send a query on a socket connection and wait for the response
+        /// </summary>
+        /// <typeparam name="T">The expected result type</typeparam>
+        /// <param name="url">The url for the request</param>
+        /// <param name="request">The request to send</param>
+        /// <param name="authenticated">Whether the socket should be authenticated</param>
+        /// <returns></returns>
+        protected virtual async Task<CallResult<T>> QueryAsync<T>(string url, object request, bool authenticated)
+        {
+            if (_disposing)
+                return new CallResult<T>(new InvalidOperationError("Client disposed, can't query"));
+
+            SocketConnection socketConnection;
+            var released = false;
+            await semaphoreSlim.WaitAsync().ConfigureAwait(false);
+            try
+            {
+                var socketResult = await GetSocketConnection(url, authenticated).ConfigureAwait(false);
+                if (!socketResult)
+                    return socketResult.As<T>(default);
+
+                socketConnection = socketResult.Data;
+
+                if (ClientOptions.SocketSubscriptionsCombineTarget == 1)
+                {
+                    // Can release early when only a single sub per connection
+                    semaphoreSlim.Release();
+                    released = true;
+                }
+
+                var connectResult = await ConnectIfNeededAsync(socketConnection, authenticated).ConfigureAwait(false);
+                if (!connectResult)
+                    return new CallResult<T>(connectResult.Error!);
+            }
+            finally
+            {
+                if (!released)
+                    semaphoreSlim.Release();
+            }
+
+            if (socketConnection.PausedActivity)
+            {
+                _logger.Log(LogLevel.Warning, $"Socket {socketConnection.SocketId} has been paused, can't send query at this moment");
+                return new CallResult<T>(new ServerError("Socket is paused"));
+            }
+
+            return await QueryAndWaitAsync<T>(socketConnection, request).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Sends the query request and waits for the result
+        /// </summary>
+        /// <typeparam name="T">The expected result type</typeparam>
+        /// <param name="socket">The connection to send and wait on</param>
+        /// <param name="request">The request to send</param>
+        /// <returns></returns>
+        protected virtual async Task<CallResult<T>> QueryAndWaitAsync<T>(SocketConnection socket, object request)
+        {
+            var dataResult = new CallResult<T>(new ServerError("No response on query received"));
+            await socket.SendAndWaitAsync(request, ClientOptions.RequestTimeout, null, data =>
+            {
+                if (!HandleQueryResponse<T>(socket, request, data, out var callResult))
+                    return false;
+
+                dataResult = callResult;
+                return true;
+            }).ConfigureAwait(false);
+
+            return dataResult;
+        }
+
+        /// <summary>
+        /// Checks if a socket needs to be connected and does so if needed. Also authenticates on the socket if needed
+        /// </summary>
+        /// <param name="socket">The connection to check</param>
+        /// <param name="authenticated">Whether the socket should authenticated</param>
+        /// <returns></returns>
+        protected virtual async Task<CallResult<bool>> ConnectIfNeededAsync(SocketConnection socket, bool authenticated)
+        {
+            if (socket.Connected)
+                return new CallResult<bool>(true);
+
+            var connectResult = await ConnectSocketAsync(socket).ConfigureAwait(false);
+            if (!connectResult)
+                return new CallResult<bool>(connectResult.Error!);
+
+            if (ClientOptions.DelayAfterConnect != TimeSpan.Zero)
+                await Task.Delay(ClientOptions.DelayAfterConnect).ConfigureAwait(false);
+
+            if (!authenticated || socket.Authenticated)
+                return new CallResult<bool>(true);
+
+            _logger.Log(LogLevel.Debug, $"Attempting to authenticate {socket.SocketId}");
+            var result = await AuthenticateSocketAsync(socket).ConfigureAwait(false);
+            if (!result)
+            {
+                _logger.Log(LogLevel.Warning, $"Socket {socket.SocketId} authentication failed");
+                if (socket.Connected)
+                    await socket.CloseAsync().ConfigureAwait(false);
+
+                result.Error!.Message = "Authentication failed: " + result.Error.Message;
+                return new CallResult<bool>(result.Error);
+            }
+
+            socket.Authenticated = true;
+            return new CallResult<bool>(true);
+        }
+
+        /// <summary>
+        /// The socketConnection received data (the data JToken parameter). The implementation of this method should check if the received data is a response to the query that was send (the request parameter).
+        /// For example; A query is sent in a request message with an Id parameter with value 10. The socket receives data and calls this method to see if the data it received is an
+        /// anwser to any query that was done. The implementation of this method should check if the response.Id == request.Id to see if they match (assuming the api has some sort of Id tracking on messages,
+        /// if not some other method has be implemented to match the messages).
+        /// If the messages match, the callResult out parameter should be set with the deserialized data in the from of (T) and return true.
+        /// </summary>
+        /// <typeparam name="T">The type of response that is expected on the query</typeparam>
+        /// <param name="socketConnection">The socket connection</param>
+        /// <param name="request">The request that a response is awaited for</param>
+        /// <param name="data">The message received from the server</param>
+        /// <param name="callResult">The interpretation (null if message wasn't a response to the request)</param>
+        /// <returns>True if the message was a response to the query</returns>
+        protected internal abstract bool HandleQueryResponse<T>(SocketConnection socketConnection, object request, JToken data, [NotNullWhen(true)] out CallResult<T>? callResult);
+        
+        /// <summary>
+        /// The socketConnection received data (the data JToken parameter). The implementation of this method should check if the received data is a response to the subscription request that was send (the request parameter).
+        /// For example; A subscribe request message is send with an Id parameter with value 10. The socket receives data and calls this method to see if the data it received is an
+        /// anwser to any subscription request that was done. The implementation of this method should check if the response.Id == request.Id to see if they match (assuming the api has some sort of Id tracking on messages,
+        /// if not some other method has be implemented to match the messages).
+        /// If the messages match, the callResult out parameter should be set with the deserialized data in the from of (T) and return true.
+        /// </summary>
+        /// <param name="socketConnection">The socket connection</param>
+        /// <param name="subscription">A subscription that waiting for a subscription response</param>
+        /// <param name="request">The request that the subscription sent</param>
+        /// <param name="data">The message received from the server</param>
+        /// <param name="callResult">The interpretation (null if message wasn't a response to the request)</param>
+        /// <returns>True if the message was a response to the subscription request</returns>
+        protected internal abstract bool HandleSubscriptionResponse(SocketConnection socketConnection, SocketSubscription subscription, object request, JToken data, out CallResult<object>? callResult);
+        
+        /// <summary>
+        /// Needs to check if a received message matches a handler by request. After subscribing data message will come in. These data messages need to be matched to a specific connection
+        /// to pass the correct data to the correct handler. The implementation of this method should check if the message received matches the subscribe request that was sent.
+        /// </summary>
+        /// <param name="socketConnection">The socket connection the message was recieved on</param>
+        /// <param name="message">The received data</param>
+        /// <param name="request">The subscription request</param>
+        /// <returns>True if the message is for the subscription which sent the request</returns>
+        protected internal abstract bool MessageMatchesHandler(SocketConnection socketConnection, JToken message, object request);
+        
+        /// <summary>
+        /// Needs to check if a received message matches a handler by identifier. Generally used by GenericHandlers. For example; a generic handler is registered which handles ping messages
+        /// from the server. This method should check if the message received is a ping message and the identifer is the identifier of the GenericHandler
+        /// </summary>
+        /// <param name="socketConnection">The socket connection the message was recieved on</param>
+        /// <param name="message">The received data</param>
+        /// <param name="identifier">The string identifier of the handler</param>
+        /// <returns>True if the message is for the handler which has the identifier</returns>
+        protected internal abstract bool MessageMatchesHandler(SocketConnection socketConnection, JToken message, string identifier);
+        
+        /// <summary>
+        /// Needs to authenticate the socket so authenticated queries/subscriptions can be made on this socket connection
+        /// </summary>
+        /// <param name="socketConnection">The socket connection that should be authenticated</param>
+        /// <returns></returns>
+        protected internal abstract Task<CallResult<bool>> AuthenticateSocketAsync(SocketConnection socketConnection);
+        
+        /// <summary>
+        /// Needs to unsubscribe a subscription, typically by sending an unsubscribe request. If multiple subscriptions per socket is not allowed this can just return since the socket will be closed anyway
+        /// </summary>
+        /// <param name="connection">The connection on which to unsubscribe</param>
+        /// <param name="subscriptionToUnsub">The subscription to unsubscribe</param>
+        /// <returns></returns>
+        protected internal abstract Task<bool> UnsubscribeAsync(SocketConnection connection, SocketSubscription subscriptionToUnsub);
+
+        /// <summary>
+        /// Optional handler to interpolate data before sending it to the handlers
+        /// </summary>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        protected internal virtual JToken ProcessTokenData(JToken message)
+        {
+            return message;
+        }
+
+        /// <summary>
+        /// Add a subscription to a connection
+        /// </summary>
+        /// <typeparam name="T">The type of data the subscription expects</typeparam>
+        /// <param name="request">The request of the subscription</param>
+        /// <param name="identifier">The identifier of the subscription (can be null if request param is used)</param>
+        /// <param name="userSubscription">Whether or not this is a user subscription (counts towards the max amount of handlers on a socket)</param>
+        /// <param name="connection">The socket connection the handler is on</param>
+        /// <param name="dataHandler">The handler of the data received</param>
+        /// <param name="authenticated">Whether the subscription needs authentication</param>
+        /// <returns></returns>
+        protected virtual SocketSubscription? AddSubscription<T>(object? request, string? identifier, bool userSubscription, SocketConnection connection, Action<DataEvent<T>> dataHandler, bool authenticated)
+        {
+            void InternalHandler(MessageEvent messageEvent)
+            {
+                if (typeof(T) == typeof(string))
+                {
+                    var stringData = (T)Convert.ChangeType(messageEvent.JsonData.ToString(), typeof(T));
+                    dataHandler(new DataEvent<T>(stringData, null, OutputOriginalData ? messageEvent.OriginalData : null, messageEvent.ReceivedTimestamp));
+                    return;
+                }
+
+                var desResult = Deserialize<T>(messageEvent.JsonData);
+                if (!desResult)
+                {
+                    _logger.Log(LogLevel.Warning, $"Socket {connection.SocketId} Failed to deserialize data into type {typeof(T)}: {desResult.Error}");
+                    return;
+                }
+
+                dataHandler(new DataEvent<T>(desResult.Data, null, OutputOriginalData ? messageEvent.OriginalData : null, messageEvent.ReceivedTimestamp));
+            }
+
+            var subscription = request == null
+                ? SocketSubscription.CreateForIdentifier(NextId(), identifier!, userSubscription, authenticated, InternalHandler)
+                : SocketSubscription.CreateForRequest(NextId(), request, userSubscription, authenticated, InternalHandler);
+            if (!connection.AddSubscription(subscription))
+                return null;
+            return subscription;
+        }
+
+        /// <summary>
+        /// Adds a generic message handler. Used for example to reply to ping requests
+        /// </summary>
+        /// <param name="identifier">The name of the request handler. Needs to be unique</param>
+        /// <param name="action">The action to execute when receiving a message for this handler (checked by <see cref="MessageMatchesHandler(SocketConnection, Newtonsoft.Json.Linq.JToken,string)"/>)</param>
+        protected void AddGenericHandler(string identifier, Action<MessageEvent> action)
+        {
+            genericHandlers.Add(identifier, action);
+            var subscription = SocketSubscription.CreateForIdentifier(NextId(), identifier, false, false, action);
+            foreach (var connection in socketConnections.Values)
+                connection.AddSubscription(subscription);
+        }
+
+        /// <summary>
+        /// Get the url to connect to (defaults to BaseAddress form the client options)
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="authentication"></param>
+        /// <returns></returns>
+        protected virtual Task<CallResult<string?>> GetConnectionUrlAsync(string address, bool authentication)
+        {
+            return Task.FromResult(new CallResult<string?>(address));
+        }
+
+        /// <summary>
+        /// Get the url to reconnect to after losing a connection
+        /// </summary>
+        /// <param name="connection"></param>
+        /// <returns></returns>
+        public virtual Task<Uri?> GetReconnectUriAsync(SocketConnection connection)
+        {
+            return Task.FromResult<Uri?>(connection.ConnectionUri);
+        }
+
+        /// <summary>
+        /// Update the original request to send when the connection is restored after disconnecting. Can be used to update an authentication token for example.
+        /// </summary>
+        /// <param name="request">The original request</param>
+        /// <returns></returns>
+        public virtual Task<CallResult<object>> RevitalizeRequestAsync(object request)
+        {
+            return Task.FromResult(new CallResult<object>(request));
+        }
+
+        /// <summary>
+        /// Gets a connection for a new subscription or query. Can be an existing if there are open position or a new one.
+        /// </summary>
+        /// <param name="address">The address the socket is for</param>
+        /// <param name="authenticated">Whether the socket should be authenticated</param>
+        /// <returns></returns>
+        protected virtual async Task<CallResult<SocketConnection>> GetSocketConnection(string address, bool authenticated)
+        {
+            var socketResult = socketConnections.Where(s => (s.Value.Status == SocketConnection.SocketStatus.None || s.Value.Status == SocketConnection.SocketStatus.Connected)
+                                                  && s.Value.Tag.TrimEnd('/') == address.TrimEnd('/')
+                                                  && (s.Value.ApiClient.GetType() == GetType())
+                                                  && (s.Value.Authenticated == authenticated || !authenticated) && s.Value.Connected).OrderBy(s => s.Value.SubscriptionCount).FirstOrDefault();
+            var result = socketResult.Equals(default(KeyValuePair<int, SocketConnection>)) ? null : socketResult.Value;
+            if (result != null)
+            {
+                if (result.SubscriptionCount < ClientOptions.SocketSubscriptionsCombineTarget || (socketConnections.Count >= (ApiOptions.MaxSocketConnections ?? ClientOptions.MaxSocketConnections) && socketConnections.All(s => s.Value.SubscriptionCount >= ClientOptions.SocketSubscriptionsCombineTarget)))
+                {
+                    // Use existing socket if it has less than target connections OR it has the least connections and we can't make new
+                    return new CallResult<SocketConnection>(result);
+                }
+            }
+
+            var connectionAddress = await GetConnectionUrlAsync(address, authenticated).ConfigureAwait(false);
+            if (!connectionAddress)
+            {
+                _logger.Log(LogLevel.Warning, $"Failed to determine connection url: " + connectionAddress.Error);
+                return connectionAddress.As<SocketConnection>(null);
+            }
+
+            if (connectionAddress.Data != address)
+                _logger.Log(LogLevel.Debug, $"Connection address set to " + connectionAddress.Data);
+
+            // Create new socket
+            var socket = CreateSocket(connectionAddress.Data!);
+            var socketConnection = new SocketConnection(_logger, this, socket, address);
+            socketConnection.UnhandledMessage += HandleUnhandledMessage;
+            foreach (var kvp in genericHandlers)
+            {
+                var handler = SocketSubscription.CreateForIdentifier(NextId(), kvp.Key, false, false, kvp.Value);
+                socketConnection.AddSubscription(handler);
+            }
+
+            return new CallResult<SocketConnection>(socketConnection);
+        }
+
+        /// <summary>
+        /// Process an unhandled message
+        /// </summary>
+        /// <param name="token">The token that wasn't processed</param>
+        protected virtual void HandleUnhandledMessage(JToken token)
+        {
+        }
+
+        /// <summary>
+        /// Connect a socket
+        /// </summary>
+        /// <param name="socketConnection">The socket to connect</param>
+        /// <returns></returns>
+        protected virtual async Task<CallResult<bool>> ConnectSocketAsync(SocketConnection socketConnection)
+        {
+            if (await socketConnection.ConnectAsync().ConfigureAwait(false))
+            {
+                socketConnections.TryAdd(socketConnection.SocketId, socketConnection);
+                return new CallResult<bool>(true);
+            }
+
+            socketConnection.Dispose();
+            return new CallResult<bool>(new CantConnectError());
+        }
+
+        /// <summary>
+        /// Get parameters for the websocket connection
+        /// </summary>
+        /// <param name="address">The address to connect to</param>
+        /// <returns></returns>
+        protected virtual WebSocketParameters GetWebSocketParameters(string address)
+            => new(new Uri(address), ClientOptions.AutoReconnect)
+            {
+                DataInterpreterBytes = dataInterpreterBytes,
+                DataInterpreterString = dataInterpreterString,
+                KeepAliveInterval = KeepAliveInterval,
+                ReconnectInterval = ClientOptions.ReconnectInterval,
+                RatelimitPerSecond = RateLimitPerSocketPerSecond,
+                Proxy = ClientOptions.Proxy,
+                Timeout = ApiOptions.SocketNoDataTimeout ?? ClientOptions.SocketNoDataTimeout
+            };
+
+        /// <summary>
+        /// Create a socket for an address
+        /// </summary>
+        /// <param name="address">The address the socket should connect to</param>
+        /// <returns></returns>
+        protected virtual IWebsocket CreateSocket(string address)
+        {
+            var socket = SocketFactory.CreateWebsocket(_logger, GetWebSocketParameters(address));
+            _logger.Log(LogLevel.Debug, $"Socket {socket.Id} new socket created for " + address);
+            return socket;
+        }
+
+        /// <summary>
+        /// Periodically sends data over a socket connection
+        /// </summary>
+        /// <param name="identifier">Identifier for the periodic send</param>
+        /// <param name="interval">How often</param>
+        /// <param name="objGetter">Method returning the object to send</param>
+        public virtual void SendPeriodic(string identifier, TimeSpan interval, Func<SocketConnection, object> objGetter)
+        {
+            if (objGetter == null)
+                throw new ArgumentNullException(nameof(objGetter));
+
+            periodicEvent = new AsyncResetEvent();
+            periodicTask = Task.Run(async () =>
+            {
+                while (!_disposing)
+                {
+                    await periodicEvent.WaitAsync(interval).ConfigureAwait(false);
+                    if (_disposing)
+                        break;
+
+                    foreach (var socketConnection in socketConnections.Values)
+                    {
+                        if (_disposing)
+                            break;
+
+                        if (!socketConnection.Connected)
+                            continue;
+
+                        var obj = objGetter(socketConnection);
+                        if (obj == null)
+                            continue;
+
+                        _logger.Log(LogLevel.Trace, $"Socket {socketConnection.SocketId} sending periodic {identifier}");
+
+                        try
+                        {
+                            socketConnection.Send(obj);
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Log(LogLevel.Warning, $"Socket {socketConnection.SocketId} Periodic send {identifier} failed: " + ex.ToLogString());
+                        }
+                    }
+                }
+            });
+        }
+
+        /// <summary>
+        /// Unsubscribe an update subscription
+        /// </summary>
+        /// <param name="subscriptionId">The id of the subscription to unsubscribe</param>
+        /// <returns></returns>
+        public virtual async Task<bool> UnsubscribeAsync(int subscriptionId)
+        {
+            SocketSubscription? subscription = null;
+            SocketConnection? connection = null;
+            foreach (var socket in socketConnections.Values.ToList())
+            {
+                subscription = socket.GetSubscription(subscriptionId);
+                if (subscription != null)
+                {
+                    connection = socket;
+                    break;
+                }
+            }
+
+            if (subscription == null || connection == null)
+                return false;
+
+            _logger.Log(LogLevel.Information, $"Socket {connection.SocketId} Unsubscribing subscription " + subscriptionId);
+            await connection.CloseAsync(subscription).ConfigureAwait(false);
+            return true;
+        }
+
+        /// <summary>
+        /// Unsubscribe an update subscription
+        /// </summary>
+        /// <param name="subscription">The subscription to unsubscribe</param>
+        /// <returns></returns>
+        public virtual async Task UnsubscribeAsync(UpdateSubscription subscription)
+        {
+            if (subscription == null)
+                throw new ArgumentNullException(nameof(subscription));
+
+            _logger.Log(LogLevel.Information, $"Socket {subscription.SocketId} Unsubscribing subscription  " + subscription.Id);
+            await subscription.CloseAsync().ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Unsubscribe all subscriptions
+        /// </summary>
+        /// <returns></returns>
+        public virtual async Task UnsubscribeAllAsync()
+        {
+            _logger.Log(LogLevel.Information, $"Unsubscribing all {socketConnections.Sum(s => s.Value.SubscriptionCount)} subscriptions");
+            var tasks = new List<Task>();
+            {
+                var socketList = socketConnections.Values;
+                foreach (var sub in socketList)
+                    tasks.Add(sub.CloseAsync()); 
+            }
+
+            await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Reconnect all connections
+        /// </summary>
+        /// <returns></returns>
+        public virtual async Task ReconnectAsync()
+        {
+            _logger.Log(LogLevel.Information, $"Reconnecting all {socketConnections.Count} connections");
+            var tasks = new List<Task>();
+            {
+                var socketList = socketConnections.Values;
+                foreach (var sub in socketList)
+                    tasks.Add(sub.TriggerReconnectAsync());
+            }
+
+            await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Log the current state of connections and subscriptions
+        /// </summary>
+        public string GetSubscriptionsState()
+        {
+            var sb = new StringBuilder();
+            sb.AppendLine($"{socketConnections.Count} connections, {CurrentSubscriptions} subscriptions, kbps: {IncomingKbps}");
+            foreach (var connection in socketConnections)
+            {
+                sb.AppendLine($"  Connection {connection.Key}: {connection.Value.SubscriptionCount} subscriptions, status: {connection.Value.Status}, authenticated: {connection.Value.Authenticated}, kbps: {connection.Value.IncomingKbps}");
+                foreach (var subscription in connection.Value.Subscriptions)
+                    sb.AppendLine($"    Subscription {subscription.Id}, authenticated: {subscription.Authenticated}, confirmed: {subscription.Confirmed}");
+            }
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Dispose the client
+        /// </summary>
+        public override void Dispose()
+        {
+            _disposing = true;
+            periodicEvent?.Set();
+            periodicEvent?.Dispose();
+            if (socketConnections.Sum(s => s.Value.SubscriptionCount) > 0)
+            {
+                _logger.Log(LogLevel.Debug, "Disposing socket client, closing all subscriptions");
+                _ = UnsubscribeAllAsync();
+            }
+            semaphoreSlim?.Dispose();
+            base.Dispose();
+        }
    }
 }
@@ -16,8 +16,8 @@ namespace CryptoExchange.Net.Converters
    /// </summary>
    public class ArrayConverter : JsonConverter
    {
-        private static readonly ConcurrentDictionary<(MemberInfo, Type), Attribute> attributeByMemberInfoAndTypeCache = new ConcurrentDictionary<(MemberInfo, Type), Attribute>();
-        private static readonly ConcurrentDictionary<(Type, Type), Attribute> attributeByTypeAndTypeCache = new ConcurrentDictionary<(Type, Type), Attribute>();
+        private static readonly ConcurrentDictionary<(MemberInfo, Type), Attribute> _attributeByMemberInfoAndTypeCache = new ConcurrentDictionary<(MemberInfo, Type), Attribute>();
+        private static readonly ConcurrentDictionary<(Type, Type), Attribute> _attributeByTypeAndTypeCache = new ConcurrentDictionary<(Type, Type), Attribute>();

        /// <inheritdoc />
        public override bool CanConvert(Type objectType)
@@ -28,6 +28,9 @@ namespace CryptoExchange.Net.Converters
        /// <inheritdoc />
        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
        {
+            if (reader.TokenType == JsonToken.Null)
+                return null;
+
            if (objectType == typeof(JToken))
                return JToken.Load(reader);

@@ -97,16 +100,20 @@ namespace CryptoExchange.Net.Converters
                }

                if (value != null && property.PropertyType.IsInstanceOfType(value))
+                {
                    property.SetValue(result, value);
+                }
                else
                {
                    if (value is JToken token)
+                    {
                        if (token.Type == JTokenType.Null)
                            value = null;
+                    }

                    if ((property.PropertyType == typeof(decimal)
                     || property.PropertyType == typeof(decimal?))
-                     && (value != null && value.ToString().Contains("e")))
+                     && (value != null && value.ToString().IndexOf("e", StringComparison.OrdinalIgnoreCase) >= 0))
                    {
                        if (decimal.TryParse(value.ToString(), NumberStyles.Float, CultureInfo.InvariantCulture, out var dec))
                            property.SetValue(result, dec);
@@ -172,10 +179,10 @@ namespace CryptoExchange.Net.Converters
        }

        private static T? GetCustomAttribute<T>(MemberInfo memberInfo) where T : Attribute =>
-            (T?)attributeByMemberInfoAndTypeCache.GetOrAdd((memberInfo, typeof(T)), tuple => memberInfo.GetCustomAttribute(typeof(T)));
+            (T?)_attributeByMemberInfoAndTypeCache.GetOrAdd((memberInfo, typeof(T)), tuple => memberInfo.GetCustomAttribute(typeof(T)));

        private static T? GetCustomAttribute<T>(Type type) where T : Attribute =>
-            (T?)attributeByTypeAndTypeCache.GetOrAdd((type, typeof(T)), tuple => type.GetCustomAttribute(typeof(T)));
+            (T?)_attributeByTypeAndTypeCache.GetOrAdd((type, typeof(T)), tuple => type.GetCustomAttribute(typeof(T)));
    }

    /// <summary>
@@ -16,7 +16,7 @@ namespace CryptoExchange.Net.Converters
        /// The enum->string mapping
        /// </summary>
        protected abstract List<KeyValuePair<T, string>> Mapping { get; }
-        private readonly bool quotes;
+        private readonly bool _quotes;
        
        /// <summary>
        /// ctor
@@ -24,14 +24,14 @@ namespace CryptoExchange.Net.Converters
        /// <param name="useQuotes"></param>
        protected BaseConverter(bool useQuotes)
        {
-            quotes = useQuotes;
+            _quotes = useQuotes;
        }

        /// <inheritdoc />
        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
        {
            var stringValue = value == null? null: GetValue((T) value);
-            if (quotes)
+            if (_quotes)
                writer.WriteValue(stringValue);
            else
                writer.WriteRawValue(stringValue);
@@ -12,9 +12,9 @@ namespace CryptoExchange.Net.Converters
    public class DateTimeConverter: JsonConverter
    {
        private static readonly DateTime _epoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-        private const long ticksPerSecond = TimeSpan.TicksPerMillisecond * 1000;
-        private const decimal ticksPerMicrosecond = TimeSpan.TicksPerMillisecond / 1000;
-        private const decimal ticksPerNanosecond = TimeSpan.TicksPerMillisecond / 1000m / 1000;
+        private const long _ticksPerSecond = TimeSpan.TicksPerMillisecond * 1000;
+        private const decimal _ticksPerMicrosecond = TimeSpan.TicksPerMillisecond / 1000;
+        private const decimal _ticksPerNanosecond = TimeSpan.TicksPerMillisecond / 1000m / 1000;

        /// <inheritdoc />
        public override bool CanConvert(Type objectType)
@@ -31,7 +31,7 @@ namespace CryptoExchange.Net.Converters
            if(reader.TokenType is JsonToken.Integer)
            {
                var longValue = (long)reader.Value;
-                if (longValue == 0)
+                if (longValue == 0 || longValue == -1)
                    return objectType == typeof(DateTime) ? default(DateTime): null;
                if (longValue < 19999999999)
                    return ConvertFromSeconds(longValue);
@@ -45,6 +45,9 @@ namespace CryptoExchange.Net.Converters
            else if (reader.TokenType is JsonToken.Float)
            {
                var doubleValue = (double)reader.Value;
+                if (doubleValue == 0 || doubleValue == -1)
+                    return objectType == typeof(DateTime) ? default(DateTime) : null;
+
                if (doubleValue < 19999999999)
                    return ConvertFromSeconds(doubleValue);
                
@@ -56,6 +59,9 @@ namespace CryptoExchange.Net.Converters
                if (string.IsNullOrWhiteSpace(stringValue))
                    return null;

+                if (string.IsNullOrWhiteSpace(stringValue) || stringValue == "0" || stringValue == "-1")
+                    return objectType == typeof(DateTime) ? default(DateTime) : null;
+
                if (stringValue.Length == 8)
                {
                    // Parse 20211103 format
@@ -128,7 +134,7 @@ namespace CryptoExchange.Net.Converters
        /// </summary>
        /// <param name="seconds"></param>
        /// <returns></returns>
-        public static DateTime ConvertFromSeconds(double seconds) => _epoch.AddTicks((long)Math.Round(seconds * ticksPerSecond));
+        public static DateTime ConvertFromSeconds(double seconds) => _epoch.AddTicks((long)Math.Round(seconds * _ticksPerSecond));
        /// <summary>
        /// Convert a milliseconds since epoch (01-01-1970) value to DateTime
        /// </summary>
@@ -140,13 +146,13 @@ namespace CryptoExchange.Net.Converters
        /// </summary>
        /// <param name="microseconds"></param>
        /// <returns></returns>
-        public static DateTime ConvertFromMicroseconds(long microseconds) => _epoch.AddTicks((long)Math.Round(microseconds * ticksPerMicrosecond));
+        public static DateTime ConvertFromMicroseconds(long microseconds) => _epoch.AddTicks((long)Math.Round(microseconds * _ticksPerMicrosecond));
        /// <summary>
        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
        /// </summary>
        /// <param name="nanoseconds"></param>
        /// <returns></returns>
-        public static DateTime ConvertFromNanoseconds(long nanoseconds) => _epoch.AddTicks((long)Math.Round(nanoseconds * ticksPerNanosecond));
+        public static DateTime ConvertFromNanoseconds(long nanoseconds) => _epoch.AddTicks((long)Math.Round(nanoseconds * _ticksPerNanosecond));
        /// <summary>
        /// Convert a DateTime value to seconds since epoch (01-01-1970) value
        /// </summary>
@@ -167,14 +173,14 @@ namespace CryptoExchange.Net.Converters
        /// <param name="time"></param>
        /// <returns></returns>
        [return: NotNullIfNotNull("time")]
-        public static long? ConvertToMicroseconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).Ticks / ticksPerMicrosecond);
+        public static long? ConvertToMicroseconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).Ticks / _ticksPerMicrosecond);
        /// <summary>
        /// Convert a DateTime value to nanoseconds since epoch (01-01-1970) value
        /// </summary>
        /// <param name="time"></param>
        /// <returns></returns>
        [return: NotNullIfNotNull("time")]
-        public static long? ConvertToNanoseconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).Ticks / ticksPerNanosecond);
+        public static long? ConvertToNanoseconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).Ticks / _ticksPerNanosecond);


        /// <inheritdoc />
@@ -132,7 +132,7 @@ namespace CryptoExchange.Net.Converters
        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
        {
            var stringValue = GetString(value);
-            writer.WriteRawValue(stringValue);
+            writer.WriteValue(stringValue);
        }
    }
 }
@@ -6,18 +6,18 @@
    <PackageId>CryptoExchange.Net</PackageId>
    <Authors>JKorf</Authors>
    <Description>A base package for implementing cryptocurrency API's</Description>
-    <PackageVersion>5.1.9</PackageVersion>
-    <AssemblyVersion>5.1.9</AssemblyVersion>
-    <FileVersion>5.1.9</FileVersion>
+    <PackageVersion>6.0.3</PackageVersion>
+    <AssemblyVersion>6.0.3</AssemblyVersion>
+    <FileVersion>6.0.3</FileVersion>
    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
    <RepositoryType>git</RepositoryType>
    <RepositoryUrl>https://github.com/JKorf/CryptoExchange.Net.git</RepositoryUrl>
    <PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net</PackageProjectUrl>
    <NeutralLanguage>en</NeutralLanguage>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageReleaseNotes>5.1.9 - Added latency to the timesync calculation, Small fix for exception in socket close handling</PackageReleaseNotes>
+    <PackageReleaseNotes>6.0.3 - Fixed Proxy not getting applied in rest clients when not using DI</PackageReleaseNotes>
    <Nullable>enable</Nullable>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
  </PropertyGroup>
  <PropertyGroup Label="Deterministic Build" Condition="'$(Configuration)' == 'Release'">
@@ -45,10 +45,11 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.32" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[3.1.0,)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.0,)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.32" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.32" />
  </ItemGroup>
 </Project>
@@ -43,7 +43,9 @@ namespace CryptoExchange.Net

            var offset = value % step.Value;
            if(roundingType == RoundingType.Down)
+            {
                value -= offset;
+            }
            else
            {
                if (offset < step / 2)
@@ -6,7 +6,6 @@ using System.Runtime.InteropServices;
 using System.Security;
 using System.Text;
 using System.Web;
-using CryptoExchange.Net.Logging;
 using CryptoExchange.Net.Objects;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
@@ -90,31 +89,6 @@ namespace CryptoExchange.Net
                parameters.Add(key, JsonConvert.SerializeObject(value, converter));
        }

-        /// <summary>
-        /// Add an optional parameter. Not added if value is null
-        /// </summary>
-        /// <param name="parameters"></param>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        public static void AddOptionalParameter(this Dictionary<string, string> parameters, string key, string? value)
-        {
-            if (value != null)
-                parameters.Add(key, value);
-        }
-
-        /// <summary>
-        /// Add an optional parameter. Not added if value is null
-        /// </summary>
-        /// <param name="parameters"></param>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <param name="converter"></param>
-        public static void AddOptionalParameter(this Dictionary<string, string> parameters, string key, string? value, JsonConverter converter)
-        {
-            if (value != null)
-                parameters.Add(key, JsonConvert.SerializeObject(value, converter));
-        }
-
        /// <summary>
        /// Create a query string of the specified parameters
        /// </summary>
@@ -129,7 +103,9 @@ namespace CryptoExchange.Net
            foreach (var arrayEntry in arraysParameters)
            {
                if (serializationType == ArrayParametersSerialization.Array)
+                {
                    uriString += $"{string.Join("&", ((object[])(urlEncodeValues ? Uri.EscapeDataString(arrayEntry.Value.ToString()) : arrayEntry.Value)).Select(v => $"{arrayEntry.Key}[]={v}"))}&";
+                }
                else
                {
                    var array = (Array)arrayEntry.Value;
@@ -160,7 +136,9 @@ namespace CryptoExchange.Net
                        formData.Add(kvp.Key, value.ToString());
                }
                else
+                {
                    formData.Add(kvp.Key, kvp.Value.ToString());
+                }
            }
            return formData.ToString();
        }
@@ -224,7 +202,11 @@ namespace CryptoExchange.Net
                        if (b1 != b2) return false;
                    }
                }
-                else return false;
+                else
+                {
+                    return false;
+                }
+
                return true;
            }
            finally
@@ -252,9 +234,9 @@ namespace CryptoExchange.Net
        /// String to JToken
        /// </summary>
        /// <param name="stringData"></param>
-        /// <param name="log"></param>
+        /// <param name="logger"></param>
        /// <returns></returns>
-        public static JToken? ToJToken(this string stringData, Log? log = null)
+        public static JToken? ToJToken(this string stringData, ILogger? logger = null)
        {
            if (string.IsNullOrEmpty(stringData))
                return null;
@@ -266,15 +248,15 @@ namespace CryptoExchange.Net
            catch (JsonReaderException jre)
            {
                var info = $"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}. Data: {stringData}";
-                log?.Write(LogLevel.Error, info);
-                if (log == null) Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | {info}");
+                logger?.Log(LogLevel.Error, info);
+                if (logger == null) Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | {info}");
                return null;
            }
            catch (JsonSerializationException jse)
            {
                var info = $"Deserialize JsonSerializationException: {jse.Message}. Data: {stringData}";
-                log?.Write(LogLevel.Error, info);
-                if (log == null) Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | {info}");
+                logger?.Log(LogLevel.Error, info);
+                if (logger == null) Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | {info}");
                return null;
            }
        }
@@ -288,8 +270,10 @@ namespace CryptoExchange.Net
        public static void ValidateIntValues(this int value, string argumentName, params int[] allowedValues)
        {
            if (!allowedValues.Contains(value))
+            {
                throw new ArgumentException(
                    $"{value} not allowed for parameter {argumentName}, allowed values: {string.Join(", ", allowedValues)}", argumentName);
+            }
        }

        /// <summary>
@@ -302,8 +286,10 @@ namespace CryptoExchange.Net
        public static void ValidateIntBetween(this int value, string argumentName, int minValue, int maxValue)
        {
            if (value < minValue || value > maxValue)
+            {
                throw new ArgumentException(
                    $"{value} not allowed for parameter {argumentName}, min: {minValue}, max: {maxValue}", argumentName);
+            }
        }

        /// <summary>
@@ -426,6 +412,7 @@ namespace CryptoExchange.Net
            var uriBuilder = new UriBuilder();
            uriBuilder.Scheme = baseUri.Scheme;
            uriBuilder.Host = baseUri.Host;
+            uriBuilder.Port = baseUri.Port;
            uriBuilder.Path = baseUri.AbsolutePath;
            var httpValueCollection = HttpUtility.ParseQueryString(string.Empty);
            foreach (var parameter in parameters)
@@ -436,7 +423,9 @@ namespace CryptoExchange.Net
                        httpValueCollection.Add(arraySerialization == ArrayParametersSerialization.Array ? parameter.Key + "[]" : parameter.Key, item.ToString());
                }
                else
+                {
                    httpValueCollection.Add(parameter.Key, parameter.Value.ToString());
+                }
            }
            uriBuilder.Query = httpValueCollection.ToString();
            return uriBuilder.Uri;
@@ -454,6 +443,7 @@ namespace CryptoExchange.Net
            var uriBuilder = new UriBuilder();
            uriBuilder.Scheme = baseUri.Scheme;
            uriBuilder.Host = baseUri.Host;
+            uriBuilder.Port = baseUri.Port;
            uriBuilder.Path = baseUri.AbsolutePath;
            var httpValueCollection = HttpUtility.ParseQueryString(string.Empty);
            foreach (var parameter in parameters)
@@ -464,13 +454,14 @@ namespace CryptoExchange.Net
                        httpValueCollection.Add(arraySerialization == ArrayParametersSerialization.Array ? parameter.Key + "[]" : parameter.Key, item.ToString());
                }
                else
+                {
                    httpValueCollection.Add(parameter.Key, parameter.Value.ToString());
+                }
            }
            uriBuilder.Query = httpValueCollection.ToString();
            return uriBuilder.Uri;
        }

-
        /// <summary>
        /// Add parameter to URI
        /// </summary>
@@ -0,0 +1,22 @@
+using CryptoExchange.Net.Authentication;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Base api client
+    /// </summary>
+    public interface IBaseApiClient
+    {
+        /// <summary>
+        /// Base address
+        /// </summary>
+        string BaseAddress { get; }
+
+        /// <summary>
+        /// Set the API credentials for this API client
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="credentials"></param>
+        void SetApiCredentials<T>(T credentials) where T : ApiCredentials;
+    }
+}
@@ -1,5 +1,5 @@
-using CryptoExchange.Net.Logging;
 using CryptoExchange.Net.Objects;
+using Microsoft.Extensions.Logging;
 using System.Net.Http;
 using System.Security;
 using System.Threading;
@@ -24,6 +24,6 @@ namespace CryptoExchange.Net.Interfaces
        /// <param name="requestWeight">The weight of the request</param>
        /// <param name="ct">Cancellation token to cancel waiting</param>
        /// <returns>The time in milliseconds spend waiting</returns>
-        Task<CallResult<int>> LimitRequestAsync(Log log, string endpoint, HttpMethod method, bool signed, SecureString? apiKey, RateLimitingBehaviour limitBehaviour, int requestWeight, CancellationToken ct);
+        Task<CallResult<int>> LimitRequestAsync(ILogger log, string endpoint, HttpMethod method, bool signed, SecureString? apiKey, RateLimitingBehaviour limitBehaviour, int requestWeight, CancellationToken ct);
    }
 }
@@ -1,4 +1,5 @@
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
 using System;
 using System.Net.Http;

@@ -22,8 +23,8 @@ namespace CryptoExchange.Net.Interfaces
        /// Configure the requests created by this factory
        /// </summary>
        /// <param name="requestTimeout">Request timeout to use</param>
-        /// <param name="proxy">Proxy settings to use</param>       
        /// <param name="httpClient">Optional shared http client instance</param>
-        void Configure(TimeSpan requestTimeout, ApiProxy? proxy, HttpClient? httpClient=null);
+        /// <param name="proxy">Optional proxy to use when no http client is provided</param>
+        void Configure(ApiProxy? proxy, TimeSpan requestTimeout, HttpClient? httpClient=null);
    }
 }
@@ -20,6 +20,11 @@ namespace CryptoExchange.Net.Interfaces
        /// </summary>
        bool IsSuccessStatusCode { get; }

+        /// <summary>
+        /// The length of the response in bytes
+        /// </summary>
+        long? ContentLength { get; }
+
        /// <summary>
        /// The response headers
        /// </summary>
@@ -0,0 +1,33 @@
+using CryptoExchange.Net.Objects;
+using System;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Base rest API client
+    /// </summary>
+    public interface IRestApiClient : IBaseApiClient
+    {
+        /// <summary>
+        /// The factory for creating requests. Used for unit testing
+        /// </summary>
+        IRequestFactory RequestFactory { get; set; }
+
+        /// <summary>
+        /// Total amount of requests made with this API client
+        /// </summary>
+        int TotalRequestsMade { get; set; }
+
+        /// <summary>
+        /// Get time offset for an API client. Return null if time syncing shouldnt/cant be done
+        /// </summary>
+        /// <returns></returns>
+        TimeSpan? GetTimeOffset();
+
+        /// <summary>
+        /// Get time sync info for an API client. Return null if time syncing shouldnt/cant be done
+        /// </summary>
+        /// <returns></returns>
+        TimeSyncInfo? GetTimeSyncInfo();
+    }
+}
@@ -1,6 +1,7 @@
 using System;
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;

 namespace CryptoExchange.Net.Interfaces
 {
@@ -10,24 +11,13 @@ namespace CryptoExchange.Net.Interfaces
    public interface IRestClient: IDisposable
    {
        /// <summary>
-        /// The factory for creating requests. Used for unit testing
+        /// The options provided for this client
        /// </summary>
-        IRequestFactory RequestFactory { get; set; }
+        ExchangeOptions ClientOptions { get; }

        /// <summary>
        /// The total amount of requests made with this client
        /// </summary>
        int TotalRequestsMade { get; }
-
-        /// <summary>
-        /// The options provided for this client
-        /// </summary>
-        BaseRestClientOptions ClientOptions { get; }
-
-        /// <summary>
-        /// Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
-        /// </summary>
-        /// <param name="credentials">The credentials to set</param>
-        void SetApiCredentials(ApiCredentials credentials);
    }
 }
@@ -0,0 +1,78 @@
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.Sockets;
+using System;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Socket API client
+    /// </summary>
+    public interface ISocketApiClient: IBaseApiClient
+    {
+        /// <summary>
+        /// The current amount of socket connections on the API client
+        /// </summary>
+        int CurrentConnections { get; }
+        /// <summary>
+        /// The current amount of subscriptions over all connections
+        /// </summary>
+        int CurrentSubscriptions { get; }
+        /// <summary>
+        /// Incoming data kpbs
+        /// </summary>
+        double IncomingKbps { get; }
+        /// <summary>
+        /// The factory for creating sockets. Used for unit testing
+        /// </summary>
+        IWebsocketFactory SocketFactory { get; set; }
+
+        /// <summary>
+        /// Get the url to reconnect to after losing a connection
+        /// </summary>
+        /// <param name="connection"></param>
+        /// <returns></returns>
+        Task<Uri?> GetReconnectUriAsync(SocketConnection connection);
+
+        /// <summary>
+        /// Log the current state of connections and subscriptions
+        /// </summary>
+        string GetSubscriptionsState();
+        /// <summary>
+        /// Reconnect all connections
+        /// </summary>
+        /// <returns></returns>
+        Task ReconnectAsync();
+        /// <summary>
+        /// Update the original request to send when the connection is restored after disconnecting. Can be used to update an authentication token for example.
+        /// </summary>
+        /// <param name="request">The original request</param>
+        /// <returns></returns>
+        Task<CallResult<object>> RevitalizeRequestAsync(object request);
+        /// <summary>
+        /// Periodically sends data over a socket connection
+        /// </summary>
+        /// <param name="identifier">Identifier for the periodic send</param>
+        /// <param name="interval">How often</param>
+        /// <param name="objGetter">Method returning the object to send</param>
+        void SendPeriodic(string identifier, TimeSpan interval, Func<SocketConnection, object> objGetter);
+        /// <summary>
+        /// Unsubscribe all subscriptions
+        /// </summary>
+        /// <returns></returns>
+        Task UnsubscribeAllAsync();
+        /// <summary>
+        /// Unsubscribe an update subscription
+        /// </summary>
+        /// <param name="subscriptionId">The id of the subscription to unsubscribe</param>
+        /// <returns></returns>
+        Task<bool> UnsubscribeAsync(int subscriptionId);
+        /// <summary>
+        /// Unsubscribe an update subscription
+        /// </summary>
+        /// <param name="subscription">The subscription to unsubscribe</param>
+        /// <returns></returns>
+        Task UnsubscribeAsync(UpdateSubscription subscription);
+    }
+}
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.Sockets;

 namespace CryptoExchange.Net.Interfaces
@@ -14,19 +15,23 @@ namespace CryptoExchange.Net.Interfaces
        /// <summary>
        /// The options provided for this client
        /// </summary>
-        BaseSocketClientOptions ClientOptions { get; }
-
-        /// <summary>
-        /// Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
-        /// </summary>
-        /// <param name="credentials">The credentials to set</param>
-        void SetApiCredentials(ApiCredentials credentials);
+        ExchangeOptions ClientOptions { get; }

        /// <summary>
        /// Incoming kilobytes per second of data
        /// </summary>
        public double IncomingKbps { get; }

+        /// <summary>
+        /// The current amount of connections to the API from this client. A connection can have multiple subscriptions.
+        /// </summary>
+        public int CurrentConnections { get; }
+        
+        /// <summary>
+        /// The current amount of subscriptions running from the client
+        /// </summary>
+        public int CurrentSubscriptions { get; }
+
        /// <summary>
        /// Unsubscribe from a stream using the subscription id received when starting the subscription
        /// </summary>
@@ -101,13 +101,22 @@ namespace CryptoExchange.Net.Interfaces

        /// <summary>
        /// Get the average price that a market order would fill at at the current order book state. This is no guarentee that an order of that quantity would actually be filled
-        /// at that price since between this calculation and the order placement the book can have changed.
+        /// at that price since between this calculation and the order placement the book might have changed.
        /// </summary>
        /// <param name="quantity">The quantity in base asset to fill</param>
        /// <param name="type">The type</param>
        /// <returns>Average fill price</returns>
        CallResult<decimal> CalculateAverageFillPrice(decimal quantity, OrderBookEntryType type);

+        /// <summary>
+        /// Get the amount of base asset which can be traded with the quote quantity when placing a market order at at the current order book state. 
+        /// This is no guarentee that an order of that quantity would actually be fill the quantity returned by this since between this calculation and the order placement the book might have changed.
+        /// </summary>
+        /// <param name="quoteQuantity">The quantity in quote asset looking to trade</param>
+        /// <param name="type">The type</param>
+        /// <returns>Amount of base asset tradable with the specified amount of quote asset</returns>
+        CallResult<decimal> CalculateTradableAmount(decimal quoteQuantity, OrderBookEntryType type);
+
        /// <summary>
        /// String representation of the top x entries
        /// </summary>
@@ -1,4 +1,5 @@
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Sockets;
 using System;
 using System.Security.Authentication;
 using System.Text;
@@ -27,36 +28,28 @@ namespace CryptoExchange.Net.Interfaces
        /// Websocket opened event
        /// </summary>
        event Action OnOpen;
+        /// <summary>
+        /// Websocket has lost connection to the server and is attempting to reconnect
+        /// </summary>
+        event Action OnReconnecting;
+        /// <summary>
+        /// Websocket has reconnected to the server
+        /// </summary>
+        event Action OnReconnected;
+        /// <summary>
+        /// Get reconntion url
+        /// </summary>
+        Func<Task<Uri?>>? GetReconnectionUrl { get; set; }

        /// <summary>
        /// Unique id for this socket
        /// </summary>
        int Id { get; }
        /// <summary>
-        /// Origin header
-        /// </summary>
-        string? Origin { get; set; }
-        /// <summary>
-        /// Encoding to use for sending/receiving string data
-        /// </summary>
-        Encoding? Encoding { get; set; }
-        /// <summary>
-        /// The max amount of outgoing messages per second
-        /// </summary>
-        int? RatelimitPerSecond { get; set; }
-        /// <summary>
        /// The current kilobytes per second of data being received, averaged over the last 3 seconds
        /// </summary>
        double IncomingKbps { get; }
        /// <summary>
-        /// Handler for byte data
-        /// </summary>
-        Func<byte[], string>? DataInterpreterBytes { get; set; }
-        /// <summary>
-        /// Handler for string data
-        /// </summary>
-        Func<string, string>? DataInterpreterString { get; set; }
-        /// <summary>
        /// The uri the socket connects to
        /// </summary>
        Uri Uri { get; }
@@ -69,37 +62,20 @@ namespace CryptoExchange.Net.Interfaces
        /// </summary>
        bool IsOpen { get; }
        /// <summary>
-        /// Supported ssl protocols
-        /// </summary>
-        SslProtocols SSLProtocols { get; set; }
-        /// <summary>
-        /// The max time for no data being received before the connection is considered lost
-        /// </summary>
-        TimeSpan Timeout { get; set; }
-        /// <summary>
-        /// Set a proxy to use when connecting
-        /// </summary>
-        /// <param name="proxy"></param>
-        void SetProxy(ApiProxy proxy);
-        /// <summary>
        /// Connect the socket
        /// </summary>
        /// <returns></returns>
-        Task<bool> ConnectAsync();        
-        /// <summary>
-        /// Receive and send messages over the connection. Resulting task should complete when closing the socket.
-        /// </summary>
-        /// <returns></returns>
-        Task ProcessAsync();
+        Task<bool> ConnectAsync();
        /// <summary>
        /// Send data
        /// </summary>
        /// <param name="data"></param>
        void Send(string data);
        /// <summary>
-        /// Reset socket when a connection is lost to prepare for a new connection
+        /// Reconnect the socket
        /// </summary>
-        void Reset();
+        /// <returns></returns>
+        Task ReconnectAsync();
        /// <summary>
        /// Close the connection
        /// </summary>
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using CryptoExchange.Net.Logging;
+using CryptoExchange.Net.Sockets;
+using Microsoft.Extensions.Logging;

 namespace CryptoExchange.Net.Interfaces
 {
@@ -11,18 +11,9 @@ namespace CryptoExchange.Net.Interfaces
        /// <summary>
        /// Create a websocket for an url
        /// </summary>
-        /// <param name="log">The logger</param>
-        /// <param name="url">The url the socket is fo</param>
+        /// <param name="logger">The logger</param>
+        /// <param name="parameters">The parameters to use for the connection</param>
        /// <returns></returns>
-        IWebsocket CreateWebsocket(Log log, string url);
-        /// <summary>
-        /// Create a websocket for an url
-        /// </summary>
-        /// <param name="log">The logger</param>
-        /// <param name="url">The url the socket is fo</param>
-        /// <param name="cookies">Cookies to be send in the initial request</param>
-        /// <param name="headers">Headers to be send in the initial request</param>
-        /// <returns></returns>
-        IWebsocket CreateWebsocket(Log log, string url, IDictionary<string, string> cookies, IDictionary<string, string> headers);
+        IWebsocket CreateWebsocket(ILogger logger, WebSocketParameters parameters);
    }
 }
@@ -1,24 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-
-namespace CryptoExchange.Net.Logging
-{
-    /// <summary>
-    /// ILogger implementation for logging to the console
-    /// </summary>
-    public class ConsoleLogger : ILogger
-    {
-        /// <inheritdoc />
-        public IDisposable BeginScope<TState>(TState state) => null!;
-
-        /// <inheritdoc />
-        public bool IsEnabled(LogLevel logLevel) => true;
-
-        /// <inheritdoc />
-        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
-        {
-            var logMessage = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | {logLevel} | {formatter(state, exception)}";
-            Console.WriteLine(logMessage);
-        }
-    }
-}
@@ -1,25 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Diagnostics;
-
-namespace CryptoExchange.Net.Logging
-{
-    /// <summary>
-    /// Default log writer, uses Trace.WriteLine
-    /// </summary>
-    public class DebugLogger: ILogger
-    {
-        /// <inheritdoc />
-        public IDisposable BeginScope<TState>(TState state) => null!;
-
-        /// <inheritdoc />
-        public bool IsEnabled(LogLevel logLevel) => true;
-
-        /// <inheritdoc />
-        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
-        {
-            var logMessage = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | {logLevel} | {formatter(state, exception)}";
-            Trace.WriteLine(logMessage);
-        }
-    }
-}
@@ -1,73 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-
-namespace CryptoExchange.Net.Logging
-{
-    /// <summary>
-    /// Log implementation
-    /// </summary>
-    public class Log
-    {
-        /// <summary>
-        /// List of ILogger implementations to forward the message to
-        /// </summary>
-        private List<ILogger> writers;
-
-        /// <summary>
-        /// The verbosity of the logging, anything more verbose will not be forwarded to the writers
-        /// </summary>
-        public LogLevel? Level { get; set; } = LogLevel.Information;
-
-        /// <summary>
-        /// Client name
-        /// </summary>
-        public string ClientName { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="clientName">The name of the client the logging is used in</param>
-        public Log(string clientName)
-        {
-            ClientName = clientName;
-            writers = new List<ILogger>();
-        }
-
-        /// <summary>
-        /// Set the writers
-        /// </summary>
-        /// <param name="textWriters"></param>
-        public void UpdateWriters(List<ILogger> textWriters)
-        {
-            writers = textWriters;
-        }
-
-        /// <summary>
-        /// Write a log entry
-        /// </summary>
-        /// <param name="logLevel">The verbosity of the message</param>
-        /// <param name="message">The message to log</param>
-        public void Write(LogLevel logLevel, string message)
-        {
-            if (Level != null && (int)logLevel < (int)Level)
-                return;
-
-            var logMessage = $"{ClientName,-10} | {message}";
-            foreach (var writer in writers.ToList())
-            {
-                try
-                {
-                    writer.Log(logLevel, logMessage);
-                }
-                catch (Exception e)
-                {
-                    // Can't write to the logging so where else to output..
-                    Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Failed to write log to writer {writer.GetType()}: " + e.ToLogString());
-                }
-            }
-        }
-    }
-}
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;

@@ -12,7 +13,7 @@ namespace CryptoExchange.Net.Objects
    public class AsyncResetEvent : IDisposable
    {
        private static readonly Task<bool> _completed = Task.FromResult(true);
-        private readonly Queue<TaskCompletionSource<bool>> _waits = new Queue<TaskCompletionSource<bool>>();
+        private Queue<TaskCompletionSource<bool>> _waits = new Queue<TaskCompletionSource<bool>>();
        private bool _signaled;
        private readonly bool _reset;

@@ -49,7 +50,13 @@ namespace CryptoExchange.Net.Objects
                        var cancellationSource = new CancellationTokenSource(timeout.Value);
                        var registration = cancellationSource.Token.Register(() =>
                        {
-                            tcs.TrySetResult(false);
+                            lock (_waits)
+                            {
+                                tcs.TrySetResult(false);
+
+                                // Not the cleanest but it works
+                                _waits = new Queue<TaskCompletionSource<bool>>(_waits.Where(i => i != tcs));
+                            }
                        }, useSynchronizationContext: false);
                    }

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
 using System.Net.Http;
+using System.Text;

 namespace CryptoExchange.Net.Objects
 {
@@ -38,6 +39,12 @@ namespace CryptoExchange.Net.Objects
        {
            return obj?.Success == true;
        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return Success ? $"Success" : $"Error: {Error}";
+        }
    }

    /// <summary>
@@ -128,6 +135,24 @@ namespace CryptoExchange.Net.Objects
            return new CallResult<K>(data, OriginalData, Error);
        }

+        /// <summary>
+        /// Copy as a dataless result
+        /// </summary>
+        /// <returns></returns>
+        public CallResult AsDataless()
+        {
+            return new CallResult(null);
+        }
+
+        /// <summary>
+        /// Copy as a dataless result
+        /// </summary>
+        /// <returns></returns>
+        public CallResult AsDatalessError(Error error)
+        {
+            return new CallResult(error);
+        }
+
        /// <summary>
        /// Copy the WebCallResult to a new data type
        /// </summary>
@@ -138,6 +163,12 @@ namespace CryptoExchange.Net.Objects
        {
            return new CallResult<K>(default, OriginalData, error);
        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return Success ? $"Success" : $"Error: {Error}";
+        }
    }

    /// <summary>
@@ -226,6 +257,12 @@ namespace CryptoExchange.Net.Objects
        {
            return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, RequestUrl, RequestBody, RequestMethod, RequestHeaders, error);
        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return (Success ? $"Success" : $"Error: {Error}") + $" in {ResponseTime}";
+        }
    }

    /// <summary>
@@ -259,6 +296,11 @@ namespace CryptoExchange.Net.Objects
        /// </summary>
        public HttpStatusCode? ResponseStatusCode { get; set; }

+        /// <summary>
+        /// Length in bytes of the response
+        /// </summary>
+        public long? ResponseLength { get; set; }
+
        /// <summary>
        /// The response headers
        /// </summary>
@@ -275,6 +317,7 @@ namespace CryptoExchange.Net.Objects
        /// <param name="code"></param>
        /// <param name="responseHeaders"></param>
        /// <param name="responseTime"></param>
+        /// <param name="responseLength"></param>
        /// <param name="originalData"></param>
        /// <param name="requestUrl"></param>
        /// <param name="requestBody"></param>
@@ -286,6 +329,7 @@ namespace CryptoExchange.Net.Objects
            HttpStatusCode? code,
            IEnumerable<KeyValuePair<string, IEnumerable<string>>>? responseHeaders,
            TimeSpan? responseTime,
+            long? responseLength,
            string? originalData,
            string? requestUrl,
            string? requestBody,
@@ -297,6 +341,7 @@ namespace CryptoExchange.Net.Objects
            ResponseStatusCode = code;
            ResponseHeaders = responseHeaders;
            ResponseTime = responseTime;
+            ResponseLength = responseLength;

            RequestUrl = requestUrl;
            RequestBody = requestBody;
@@ -304,11 +349,28 @@ namespace CryptoExchange.Net.Objects
            RequestMethod = requestMethod;
        }

+        /// <summary>
+        /// Copy as a dataless result
+        /// </summary>
+        /// <returns></returns>
+        public new WebCallResult AsDataless()
+        {
+            return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, RequestUrl, RequestBody, RequestMethod, RequestHeaders, Error);
+        }
+        /// <summary>
+        /// Copy as a dataless result
+        /// </summary>
+        /// <returns></returns>
+        public new WebCallResult AsDatalessError(Error error)
+        {
+            return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, RequestUrl, RequestBody, RequestMethod, RequestHeaders, error);
+        }
+
        /// <summary>
        /// Create a new error result
        /// </summary>
        /// <param name="error">The error</param>
-        public WebCallResult(Error? error) : this(null, null, null, null, null, null, null, null, default, error) { }
+        public WebCallResult(Error? error) : this(null, null, null, null, null, null, null, null, null, default, error) { }

        /// <summary>
        /// Copy the WebCallResult to a new data type
@@ -318,25 +380,7 @@ namespace CryptoExchange.Net.Objects
        /// <returns></returns>
        public new WebCallResult<K> As<K>([AllowNull] K data)
        {
-            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, OriginalData, RequestUrl, RequestBody, RequestMethod, RequestHeaders, data, Error);
-        }
-
-        /// <summary>
-        /// Copy as a dataless result
-        /// </summary>
-        /// <returns></returns>
-        public WebCallResult AsDataless()
-        {
-            return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, RequestUrl, RequestBody, RequestMethod, RequestHeaders, Error);
-        }
-
-        /// <summary>
-        /// Copy as a dataless result
-        /// </summary>
-        /// <returns></returns>
-        public WebCallResult AsDatalessError(Error error)
-        {
-            return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, RequestUrl, RequestBody, RequestMethod, RequestHeaders, error);
+            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestUrl, RequestBody, RequestMethod, RequestHeaders, data, Error);
        }

        /// <summary>
@@ -347,7 +391,20 @@ namespace CryptoExchange.Net.Objects
        /// <returns></returns>
        public new WebCallResult<K> AsError<K>(Error error)
        {
-            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, OriginalData, RequestUrl, RequestBody, RequestMethod, RequestHeaders, default, error);
+            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestUrl, RequestBody, RequestMethod, RequestHeaders, default, error);
+        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append(Success ? $"Success response" : $"Error response: {Error}");
+            if (ResponseLength != null)
+                sb.Append($", {ResponseLength} bytes");
+            if (ResponseTime != null)
+                sb.Append($" received in {Math.Round(ResponseTime?.TotalMilliseconds ?? 0)}ms");
+
+            return sb.ToString();
        }
    }
 }
@@ -1,347 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Logging;
-using Microsoft.Extensions.Logging;
-
-namespace CryptoExchange.Net.Objects
-{
-    /// <summary>
-    /// Base options, applicable to everything
-    /// </summary>
-    public class BaseOptions
-    {
-        /// <summary>
-        /// The minimum log level to output
-        /// </summary>
-        public LogLevel LogLevel { get; set; } = LogLevel.Information;
-
-        /// <summary>
-        /// The log writers
-        /// </summary>
-        public List<ILogger> LogWriters { get; set; } = new List<ILogger> { new DebugLogger() };
-
-        /// <summary>
-        /// If true, the CallResult and DataEvent objects will also include the originally received json data in the OriginalData property
-        /// </summary>
-        public bool OutputOriginalData { get; set; } = false;
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public BaseOptions(): this(null)
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="baseOptions">Copy options from these options to the new options</param>
-        public BaseOptions(BaseOptions? baseOptions)
-        {
-            if (baseOptions == null)
-                return;
-
-            LogLevel = baseOptions.LogLevel;
-            LogWriters = baseOptions.LogWriters.ToList();
-            OutputOriginalData = baseOptions.OutputOriginalData;
-        }
-
-        /// <inheritdoc />
-        public override string ToString()
-        {
-            return $"LogLevel: {LogLevel}, Writers: {LogWriters.Count}, OutputOriginalData: {OutputOriginalData}";
-        }
-    }
-
-    /// <summary>
-    /// Client options, for both the socket and rest clients
-    /// </summary>
-    public class BaseClientOptions : BaseOptions
-    {
-        /// <summary>
-        /// Proxy to use when connecting
-        /// </summary>
-        public ApiProxy? Proxy { get; set; }
-
-        /// <summary>
-        /// Api credentials to be used for signing requests to private endpoints. These credentials will be used for each API in the client, unless overriden in the API options 
-        /// </summary>
-        public ApiCredentials? ApiCredentials { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public BaseClientOptions() : this(null)
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="baseOptions">Copy options from these options to the new options</param>
-        public BaseClientOptions(BaseClientOptions? baseOptions) : base(baseOptions)
-        {
-            if (baseOptions == null)
-                return;
-
-            Proxy = baseOptions.Proxy;
-            ApiCredentials = baseOptions.ApiCredentials?.Copy();
-        }
-
-        /// <inheritdoc />
-        public override string ToString()
-        {
-            return $"{base.ToString()}, Proxy: {(Proxy == null ? "-" : Proxy.Host)}, Base.ApiCredentials: {(ApiCredentials == null ? "-" : "set")}";
-        }
-    }
-
-    /// <summary>
-    /// Rest client options
-    /// </summary>
-    public class BaseRestClientOptions : BaseClientOptions
-    {
-        /// <summary>
-        /// The time the server has to respond to a request before timing out
-        /// </summary>
-        public TimeSpan RequestTimeout { get; set; } = TimeSpan.FromSeconds(30);
-
-        /// <summary>
-        /// Http client to use. If a HttpClient is provided in this property the RequestTimeout and Proxy options provided in these options will be ignored in requests and should be set on the provided HttpClient instance
-        /// </summary>
-        public HttpClient? HttpClient { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public BaseRestClientOptions(): this(null)
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="baseOptions">Copy options from these options to the new options</param>
-        public BaseRestClientOptions(BaseRestClientOptions? baseOptions): base(baseOptions)
-        {
-            if (baseOptions == null)
-                return;
-
-            HttpClient = baseOptions.HttpClient;
-            RequestTimeout = baseOptions.RequestTimeout;
-        }
-
-        /// <inheritdoc />
-        public override string ToString()
-        {
-            return $"{base.ToString()}, RequestTimeout: {RequestTimeout:c}, HttpClient: {(HttpClient == null ? "-" : "set")}";
-        }
-    }
-
-    /// <summary>
-    /// Socket client options
-    /// </summary>
-    public class BaseSocketClientOptions : BaseClientOptions
-    {
-        /// <summary>
-        /// Whether or not the socket should automatically reconnect when losing connection
-        /// </summary>
-        public bool AutoReconnect { get; set; } = true;
-
-        /// <summary>
-        /// Time to wait between reconnect attempts
-        /// </summary>
-        public TimeSpan ReconnectInterval { get; set; } = TimeSpan.FromSeconds(5);
-
-        /// <summary>
-        /// The maximum number of times to try to reconnect, default null will retry indefinitely 
-        /// </summary>
-        public int? MaxReconnectTries { get; set; }
-
-        /// <summary>
-        /// The maximum number of times to try to resubscribe after reconnecting
-        /// </summary>
-        public int? MaxResubscribeTries { get; set; }
-
-        /// <summary>
-        /// Max number of concurrent resubscription tasks per socket after reconnecting a socket
-        /// </summary>
-        public int MaxConcurrentResubscriptionsPerSocket { get; set; } = 5;
-
-        /// <summary>
-        /// The max time to wait for a response after sending a request on the socket before giving a timeout
-        /// </summary>
-        public TimeSpan SocketResponseTimeout { get; set; } = TimeSpan.FromSeconds(10);
-
-        /// <summary>
-        /// The max time of not receiving any data after which the connection is assumed to be dropped. This can only be used for socket connections where a steady flow of data is expected,
-        /// for example when the server sends intermittent ping requests
-        /// </summary>
-        public TimeSpan SocketNoDataTimeout { get; set; }
-
-        /// <summary>
-        /// The amount of subscriptions that should be made on a single socket connection. Not all API's support multiple subscriptions on a single socket.
-        /// Setting this to a higher number increases subscription speed because not every subscription needs to connect to the server, but having more subscriptions on a 
-        /// single connection will also increase the amount of traffic on that single connection, potentially leading to issues.
-        /// </summary>
-        public int? SocketSubscriptionsCombineTarget { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public BaseSocketClientOptions(): this(null)
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="baseOptions">Copy options from these options to the new options</param>
-        public BaseSocketClientOptions(BaseSocketClientOptions? baseOptions): base(baseOptions)
-        {
-            if (baseOptions == null)
-                return;
-
-            AutoReconnect = baseOptions.AutoReconnect;
-            ReconnectInterval = baseOptions.ReconnectInterval;
-            MaxReconnectTries = baseOptions.MaxReconnectTries;
-            MaxResubscribeTries = baseOptions.MaxResubscribeTries;
-            MaxConcurrentResubscriptionsPerSocket = baseOptions.MaxConcurrentResubscriptionsPerSocket;
-            SocketResponseTimeout = baseOptions.SocketResponseTimeout;
-            SocketNoDataTimeout = baseOptions.SocketNoDataTimeout;
-            SocketSubscriptionsCombineTarget = baseOptions.SocketSubscriptionsCombineTarget;
-        }
-
-        /// <inheritdoc />
-        public override string ToString()
-        {
-            return $"{base.ToString()}, AutoReconnect: {AutoReconnect}, ReconnectInterval: {ReconnectInterval}, MaxReconnectTries: {MaxReconnectTries}, MaxResubscribeTries: {MaxResubscribeTries}, MaxConcurrentResubscriptionsPerSocket: {MaxConcurrentResubscriptionsPerSocket}, SocketResponseTimeout: {SocketResponseTimeout:c}, SocketNoDataTimeout: {SocketNoDataTimeout}, SocketSubscriptionsCombineTarget: {SocketSubscriptionsCombineTarget}";
-        }
-    }
-
-    /// <summary>
-    /// API client options
-    /// </summary>
-    public class ApiClientOptions
-    {
-        /// <summary>
-        /// The base address of the API
-        /// </summary>
-        public string BaseAddress { get; set; }
-
-        /// <summary>
-        /// The api credentials used for signing requests to this API. Overrides API credentials provided in the client options
-        /// </summary>        
-        public ApiCredentials? ApiCredentials { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-#pragma warning disable 8618 // Will always get filled by the implementation
-        public ApiClientOptions()
-        {
-        }
-#pragma warning restore 8618
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="baseAddress">Base address for the API</param>
-        public ApiClientOptions(string baseAddress)
-        {
-            BaseAddress = baseAddress;
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="baseOptions">Copy values for the provided options</param>
-        /// <param name="newValues">Copy values for the provided options</param>
-        public ApiClientOptions(ApiClientOptions baseOptions, ApiClientOptions? newValues)
-        {
-            BaseAddress = newValues?.BaseAddress ?? baseOptions.BaseAddress;
-            ApiCredentials = newValues?.ApiCredentials?.Copy() ?? baseOptions.ApiCredentials?.Copy();
-        }
-
-        /// <inheritdoc />
-        public override string ToString()
-        {
-            return $"Credentials: {(ApiCredentials == null ? "-" : "Set")}, BaseAddress: {BaseAddress}";
-        }
-    }
-    
-    /// <summary>
-    /// Rest API client options
-    /// </summary>
-    public class RestApiClientOptions: ApiClientOptions
-    {
-        /// <summary>
-        /// List of rate limiters to use
-        /// </summary>
-        public List<IRateLimiter> RateLimiters { get; set; } = new List<IRateLimiter>();
-
-        /// <summary>
-        /// What to do when a call would exceed the rate limit
-        /// </summary>
-        public RateLimitingBehaviour RateLimitingBehaviour { get; set; } = RateLimitingBehaviour.Wait;
-
-        /// <summary>
-        /// Whether or not to automatically sync the local time with the server time
-        /// </summary>
-        public bool AutoTimestamp { get; set; }
-
-        /// <summary>
-        /// How often the timestamp adjustment between client and server is recalculated. If you need a very small TimeSpan here you're probably better of syncing your server time more often
-        /// </summary>
-        public TimeSpan TimestampRecalculationInterval { get; set; } = TimeSpan.FromHours(1);
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public RestApiClientOptions()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="baseAddress">Base address for the API</param>
-        public RestApiClientOptions(string baseAddress): base(baseAddress)
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="baseOn">Copy values for the provided options</param>
-        /// <param name="newValues">Copy values for the provided options</param>
-        public RestApiClientOptions(RestApiClientOptions baseOn, RestApiClientOptions? newValues): base(baseOn, newValues)
-        {
-            RateLimitingBehaviour = newValues?.RateLimitingBehaviour ?? baseOn.RateLimitingBehaviour;
-            AutoTimestamp = newValues?.AutoTimestamp ?? baseOn.AutoTimestamp;
-            TimestampRecalculationInterval = newValues?.TimestampRecalculationInterval ?? baseOn.TimestampRecalculationInterval;
-            RateLimiters = newValues?.RateLimiters.ToList() ?? baseOn?.RateLimiters.ToList() ?? new List<IRateLimiter>();
-        }
-
-        /// <inheritdoc />
-        public override string ToString()
-        {
-            return $"{base.ToString()}, RateLimiters: {RateLimiters?.Count}, RateLimitBehaviour: {RateLimitingBehaviour}, AutoTimestamp: {AutoTimestamp}, TimestampRecalculationInterval: {TimestampRecalculationInterval}";
-        }
-    }
-
-    /// <summary>
-    /// Base for order book options
-    /// </summary>
-    public class OrderBookOptions : BaseOptions
-    {
-        /// <summary>
-        /// Whether or not checksum validation is enabled. Default is true, disabling will ignore checksum messages.
-        /// </summary>
-        public bool ChecksumValidationEnabled { get; set; } = true;
-    }
-
-}
@@ -0,0 +1,20 @@
+using CryptoExchange.Net.Authentication;
+
+namespace CryptoExchange.Net.Objects.Options
+{
+    /// <summary>
+    /// Options for API usage
+    /// </summary>
+    public class ApiOptions
+    {
+        /// <summary>
+        /// If true, the CallResult and DataEvent objects will also include the originally received json data in the OriginalData property
+        /// </summary>
+        public bool? OutputOriginalData { get; set; }
+
+        /// <summary>
+        /// The api credentials used for signing requests to this API. Overrides API credentials provided in the client options
+        /// </summary>        
+        public ApiCredentials? ApiCredentials { get; set; }
+    }
+}
@@ -0,0 +1,37 @@
+using CryptoExchange.Net.Authentication;
+using System;
+
+namespace CryptoExchange.Net.Objects.Options
+{
+    /// <summary>
+    /// Exchange options
+    /// </summary>
+    public class ExchangeOptions
+    {
+        /// <summary>
+        /// Proxy settings
+        /// </summary>
+        public ApiProxy? Proxy { get; set; }
+
+        /// <summary>
+        /// If true, the CallResult and DataEvent objects will also include the originally received json data in the OriginalData property
+        /// </summary>
+        public bool OutputOriginalData { get; set; } = false;
+
+        /// <summary>
+        /// The max time a request is allowed to take
+        /// </summary>
+        public TimeSpan RequestTimeout { get; set; } = TimeSpan.FromSeconds(20);
+
+        /// <summary>
+        /// The api credentials used for signing requests to this API.
+        /// </summary>        
+        public ApiCredentials? ApiCredentials { get; set; }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return $"RequestTimeout: {RequestTimeout}, Proxy: {(Proxy == null ? "-" : "set")}, ApiCredentials: {(ApiCredentials == null ? "-" : "set")}";
+        }
+    }
+}
@@ -0,0 +1,30 @@
+namespace CryptoExchange.Net.Objects.Options
+{
+    /// <summary>
+    /// Base for order book options
+    /// </summary>
+    public class OrderBookOptions : ExchangeOptions
+    {
+        /// <summary>
+        /// Whether or not checksum validation is enabled. Default is true, disabling will ignore checksum messages.
+        /// </summary>
+        public bool ChecksumValidationEnabled { get; set; } = true;
+
+        /// <summary>
+        /// Create a copy of this options
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public T Copy<T>() where T : OrderBookOptions, new()
+        {
+            return new T
+            {
+                ApiCredentials = ApiCredentials?.Copy(),
+                OutputOriginalData = OutputOriginalData,
+                ChecksumValidationEnabled = ChecksumValidationEnabled,
+                Proxy = Proxy,
+                RequestTimeout = RequestTimeout
+            };
+        }
+    }
+}
@@ -0,0 +1,67 @@
+using CryptoExchange.Net.Authentication;
+using CryptoExchange.Net.Interfaces;
+using System;
+using System.Collections.Generic;
+
+namespace CryptoExchange.Net.Objects.Options
+{
+    /// <summary>
+    /// Http api options
+    /// </summary>
+    public class RestApiOptions : ApiOptions
+    {
+        /// <summary>
+        /// List of rate limiters to use
+        /// </summary>
+        public List<IRateLimiter> RateLimiters { get; set; } = new List<IRateLimiter>();
+
+        /// <summary>
+        /// What to do when a call would exceed the rate limit
+        /// </summary>
+        public RateLimitingBehaviour RateLimitingBehaviour { get; set; } = RateLimitingBehaviour.Wait;
+
+        /// <summary>
+        /// Whether or not to automatically sync the local time with the server time
+        /// </summary>
+        public bool? AutoTimestamp { get; set; }
+
+        /// <summary>
+        /// How often the timestamp adjustment between client and server is recalculated. If you need a very small TimeSpan here you're probably better of syncing your server time more often
+        /// </summary>
+        public TimeSpan? TimestampRecalculationInterval { get; set; }
+
+        /// <summary>
+        /// Create a copy of this options
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public virtual T Copy<T>() where T : RestApiOptions, new()
+        {
+            return new T
+            {
+                ApiCredentials = ApiCredentials?.Copy(),
+                OutputOriginalData = OutputOriginalData,
+                AutoTimestamp = AutoTimestamp,
+                RateLimiters = RateLimiters,
+                RateLimitingBehaviour = RateLimitingBehaviour,
+                TimestampRecalculationInterval = TimestampRecalculationInterval
+            };
+        }
+    }
+
+    /// <summary>
+    /// Http API options
+    /// </summary>
+    /// <typeparam name="TApiCredentials"></typeparam>
+    public class RestApiOptions<TApiCredentials>: RestApiOptions where TApiCredentials: ApiCredentials
+    {
+        /// <summary>
+        /// The api credentials used for signing requests to this API.
+        /// </summary>
+        public new TApiCredentials? ApiCredentials
+        {
+            get => (TApiCredentials?)base.ApiCredentials;
+            set => base.ApiCredentials = value;
+        }
+    }
+}
@@ -0,0 +1,83 @@
+using CryptoExchange.Net.Authentication;
+using System;
+
+namespace CryptoExchange.Net.Objects.Options
+{
+    /// <summary>
+    /// Options for a rest exchange client
+    /// </summary>
+    public class RestExchangeOptions: ExchangeOptions
+    {
+        /// <summary>
+        /// Whether or not to automatically sync the local time with the server time
+        /// </summary>
+        public bool AutoTimestamp { get; set; }
+
+        /// <summary>
+        /// How often the timestamp adjustment between client and server is recalculated. If you need a very small TimeSpan here you're probably better of syncing your server time more often
+        /// </summary>
+        public TimeSpan TimestampRecalculationInterval { get; set; } = TimeSpan.FromHours(1);
+
+        /// <summary>
+        /// Create a copy of this options
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public T Copy<T>() where T : RestExchangeOptions, new()
+        {
+            return new T
+            {
+                OutputOriginalData = OutputOriginalData,
+                AutoTimestamp = AutoTimestamp,
+                TimestampRecalculationInterval = TimestampRecalculationInterval,
+                ApiCredentials = ApiCredentials?.Copy(),
+                Proxy = Proxy,
+                RequestTimeout = RequestTimeout
+            };
+        }
+    }
+
+    /// <summary>
+    /// Options for a rest exchange client
+    /// </summary>
+    /// <typeparam name="TEnvironment"></typeparam>
+    public class RestExchangeOptions<TEnvironment> : RestExchangeOptions where TEnvironment : TradeEnvironment
+    {
+        /// <summary>
+        /// Trade environment. Contains info about URL's to use to connect to the API. To swap environment select another environment for
+        /// the exhange's environment list or create a custom environment using either `[Exchange]Environment.CreateCustom()` or `[Exchange]Environment.[Environment]`, for example `KucoinEnvironment.TestNet` or `BinanceEnvironment.Live`
+        /// </summary>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+        public TEnvironment Environment { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
+        /// <summary>
+        /// Create a copy of this options
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public new T Copy<T>() where T : RestExchangeOptions<TEnvironment>, new()
+        {
+            var result = base.Copy<T>();
+            result.Environment = Environment;
+            return result;
+        }
+    }
+
+    /// <summary>
+    /// Options for a rest exchange client
+    /// </summary>
+    /// <typeparam name="TEnvironment"></typeparam>
+    /// <typeparam name="TApiCredentials"></typeparam>
+    public class RestExchangeOptions<TEnvironment, TApiCredentials> : RestExchangeOptions<TEnvironment> where TEnvironment : TradeEnvironment where TApiCredentials : ApiCredentials
+    {
+        /// <summary>
+        /// The api credentials used for signing requests to this API.
+        /// </summary>        
+        public new TApiCredentials? ApiCredentials
+        {
+            get => (TApiCredentials?)base.ApiCredentials;
+            set => base.ApiCredentials = value;
+        }
+    }
+}
@@ -0,0 +1,54 @@
+using CryptoExchange.Net.Authentication;
+using System;
+
+namespace CryptoExchange.Net.Objects.Options
+{
+    /// <summary>
+    /// Socket api options
+    /// </summary>
+    public class SocketApiOptions : ApiOptions
+    {
+        /// <summary>
+        /// The max time of not receiving any data after which the connection is assumed to be dropped. This can only be used for socket connections where a steady flow of data is expected,
+        /// for example when the server sends intermittent ping requests
+        /// </summary>
+        public TimeSpan? SocketNoDataTimeout { get; set; }
+
+        /// <summary>
+        /// The max amount of connections to make to the server. Can be used for API's which only allow a certain number of connections. Changing this to a high value might cause issues.
+        /// </summary>
+        public int? MaxSocketConnections { get; set; }
+
+        /// <summary>
+        /// Create a copy of this options
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public T Copy<T>() where T : SocketApiOptions, new()
+        {
+            return new T
+            {
+                ApiCredentials = ApiCredentials?.Copy(),
+                OutputOriginalData = OutputOriginalData,
+                SocketNoDataTimeout = SocketNoDataTimeout,
+                MaxSocketConnections = MaxSocketConnections,
+            };
+        }
+    }
+
+    /// <summary>
+    /// Socket API options
+    /// </summary>
+    /// <typeparam name="TApiCredentials"></typeparam>
+    public class SocketApiOptions<TApiCredentials> : SocketApiOptions where TApiCredentials : ApiCredentials
+    {
+        /// <summary>
+        /// The api credentials used for signing requests to this API.
+        /// </summary>        
+        public new TApiCredentials? ApiCredentials
+        {
+            get => (TApiCredentials?)base.ApiCredentials;
+            set => base.ApiCredentials = value;
+        }
+    }
+}
@@ -0,0 +1,116 @@
+using CryptoExchange.Net.Authentication;
+using System;
+
+namespace CryptoExchange.Net.Objects.Options
+{
+    /// <summary>
+    /// Options for a websocket exchange client
+    /// </summary>
+    public class SocketExchangeOptions : ExchangeOptions
+    {
+        /// <summary>
+        /// Whether or not the socket should automatically reconnect when losing connection
+        /// </summary>
+        public bool AutoReconnect { get; set; } = true;
+
+        /// <summary>
+        /// Time to wait between reconnect attempts
+        /// </summary>
+        public TimeSpan ReconnectInterval { get; set; } = TimeSpan.FromSeconds(5);
+
+        /// <summary>
+        /// Max number of concurrent resubscription tasks per socket after reconnecting a socket
+        /// </summary>
+        public int MaxConcurrentResubscriptionsPerSocket { get; set; } = 5;
+
+        /// <summary>
+        /// The max time of not receiving any data after which the connection is assumed to be dropped. This can only be used for socket connections where a steady flow of data is expected,
+        /// for example when the server sends intermittent ping requests
+        /// </summary>
+        public TimeSpan SocketNoDataTimeout { get; set; }
+
+        /// <summary>
+        /// The amount of subscriptions that should be made on a single socket connection. Not all API's support multiple subscriptions on a single socket.
+        /// Setting this to a higher number increases subscription speed because not every subscription needs to connect to the server, but having more subscriptions on a 
+        /// single connection will also increase the amount of traffic on that single connection, potentially leading to issues.
+        /// </summary>
+        public int? SocketSubscriptionsCombineTarget { get; set; }
+
+        /// <summary>
+        /// The max amount of connections to make to the server. Can be used for API's which only allow a certain number of connections. Changing this to a high value might cause issues.
+        /// </summary>
+        public int? MaxSocketConnections { get; set; }
+
+        /// <summary>
+        /// The time to wait after connecting a socket before sending messages. Can be used for API's which will rate limit if you subscribe directly after connecting.
+        /// </summary>
+        public TimeSpan DelayAfterConnect { get; set; } = TimeSpan.Zero;
+
+        /// <summary>
+        /// Create a copy of this options
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public T Copy<T>() where T : SocketExchangeOptions, new()
+        {
+            return new T
+            {
+                ApiCredentials = ApiCredentials?.Copy(),
+                OutputOriginalData = OutputOriginalData,
+                AutoReconnect = AutoReconnect,
+                DelayAfterConnect = DelayAfterConnect,
+                MaxConcurrentResubscriptionsPerSocket = MaxConcurrentResubscriptionsPerSocket,
+                ReconnectInterval = ReconnectInterval,
+                SocketNoDataTimeout = SocketNoDataTimeout,
+                SocketSubscriptionsCombineTarget = SocketSubscriptionsCombineTarget,
+                MaxSocketConnections = MaxSocketConnections,
+                Proxy = Proxy,
+                RequestTimeout = RequestTimeout
+            };
+        }
+    }
+
+    /// <summary>
+    /// Options for a socket exchange client
+    /// </summary>
+    /// <typeparam name="TEnvironment"></typeparam>
+    public class SocketExchangeOptions<TEnvironment> : SocketExchangeOptions where TEnvironment : TradeEnvironment
+    {
+        /// <summary>
+        /// Trade environment. Contains info about URL's to use to connect to the API. To swap environment select another environment for
+        /// the exhange's environment list or create a custom environment using either `[Exchange]Environment.CreateCustom()` or `[Exchange]Environment.[Environment]`, for example `KucoinEnvironment.TestNet` or `BinanceEnvironment.Live`
+        /// </summary>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+        public TEnvironment Environment { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
+        /// <summary>
+        /// Create a copy of this options
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public new T Copy<T>() where T : SocketExchangeOptions<TEnvironment>, new()
+        {
+            var result = base.Copy<T>();
+            result.Environment = Environment;
+            return result;
+        }
+    }
+
+    /// <summary>
+    /// Options for a socket exchange client
+    /// </summary>
+    /// <typeparam name="TEnvironment"></typeparam>
+    /// <typeparam name="TApiCredentials"></typeparam>
+    public class SocketExchangeOptions<TEnvironment, TApiCredentials> : SocketExchangeOptions<TEnvironment> where TEnvironment : TradeEnvironment where TApiCredentials : ApiCredentials
+    {
+        /// <summary>
+        /// The api credentials used for signing requests to this API.
+        /// </summary>        
+        public new TApiCredentials? ApiCredentials
+        {
+            get => (TApiCredentials?)base.ApiCredentials;
+            set => base.ApiCredentials = value;
+        }
+    }
+}
@@ -1,5 +1,4 @@
 using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Logging;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -101,7 +100,7 @@ namespace CryptoExchange.Net.Objects
        }

        /// <inheritdoc />
-        public async Task<CallResult<int>> LimitRequestAsync(Log log, string endpoint, HttpMethod method, bool signed, SecureString? apiKey, RateLimitingBehaviour limitBehaviour, int requestWeight, CancellationToken ct)
+        public async Task<CallResult<int>> LimitRequestAsync(ILogger logger, string endpoint, HttpMethod method, bool signed, SecureString? apiKey, RateLimitingBehaviour limitBehaviour, int requestWeight, CancellationToken ct)
        {
            int totalWaitTime = 0;

@@ -110,7 +109,7 @@ namespace CryptoExchange.Net.Objects
                endpointLimit = Limiters.OfType<EndpointRateLimiter>().SingleOrDefault(h => h.Endpoints.Contains(endpoint) && (h.Method  == null || h.Method == method));
            if(endpointLimit != null)
            {
-                var waitResult = await ProcessTopic(log, endpointLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
+                var waitResult = await ProcessTopic(logger, endpointLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
                if (!waitResult)
                    return waitResult;

@@ -138,7 +137,7 @@ namespace CryptoExchange.Net.Objects
                        }
                    }

-                    var waitResult = await ProcessTopic(log, thisEndpointLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
+                    var waitResult = await ProcessTopic(logger, thisEndpointLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
                    if (!waitResult)
                        return waitResult;

@@ -146,7 +145,7 @@ namespace CryptoExchange.Net.Objects
                }
                else
                {
-                    var waitResult = await ProcessTopic(log, partialEndpointLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
+                    var waitResult = await ProcessTopic(logger, partialEndpointLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
                    if (!waitResult)
                        return waitResult;

@@ -166,7 +165,7 @@ namespace CryptoExchange.Net.Objects
                {
                    if (!apiLimit.OnlyForSignedRequests)
                    {
-                        var waitResult = await ProcessTopic(log, apiLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
+                        var waitResult = await ProcessTopic(logger, apiLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
                        if (!waitResult)
                            return waitResult;

@@ -186,7 +185,7 @@ namespace CryptoExchange.Net.Objects
                        }
                    }

-                    var waitResult = await ProcessTopic(log, thisApiLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
+                    var waitResult = await ProcessTopic(logger, thisApiLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
                    if (!waitResult)
                        return waitResult;

@@ -202,7 +201,7 @@ namespace CryptoExchange.Net.Objects
                totalLimit = Limiters.OfType<TotalRateLimiter>().SingleOrDefault();
            if (totalLimit != null)
            {
-                var waitResult = await ProcessTopic(log, totalLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
+                var waitResult = await ProcessTopic(logger, totalLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
                if (!waitResult)
                    return waitResult;

@@ -212,7 +211,7 @@ namespace CryptoExchange.Net.Objects
            return new CallResult<int>(totalWaitTime);
        }

-        private static async Task<CallResult<int>> ProcessTopic(Log log, Limiter historyTopic, string endpoint, int requestWeight, RateLimitingBehaviour limitBehaviour, CancellationToken ct)
+        private static async Task<CallResult<int>> ProcessTopic(ILogger logger, Limiter historyTopic, string endpoint, int requestWeight, RateLimitingBehaviour limitBehaviour, CancellationToken ct)
        {
            var sw = Stopwatch.StartNew();
            try
@@ -256,11 +255,11 @@ namespace CryptoExchange.Net.Objects
                        {
                            historyTopic.Semaphore.Release();
                            var msg = $"Request to {endpoint} failed because of rate limit `{historyTopic.Type}`. Current weight: {currentWeight}/{historyTopic.Limit}, request weight: {requestWeight}";
-                            log.Write(LogLevel.Warning, msg);
+                            logger.Log(LogLevel.Warning, msg);
                            return new CallResult<int>(new RateLimitError(msg));
                        }

-                        log.Write(LogLevel.Information, $"Request to {endpoint} waiting {thisWaitTime}ms for rate limit `{historyTopic.Type}`. Current weight: {currentWeight}/{historyTopic.Limit}, request weight: {requestWeight}");
+                        logger.Log(LogLevel.Information, $"Request to {endpoint} waiting {thisWaitTime}ms for rate limit `{historyTopic.Type}`. Current weight: {currentWeight}/{historyTopic.Limit}, request weight: {requestWeight}");
                        try
                        {
                            await Task.Delay(thisWaitTime, ct).ConfigureAwait(false);
@@ -1,6 +1,5 @@
 using System;
 using System.Threading;
-using CryptoExchange.Net.Logging;
 using Microsoft.Extensions.Logging;

 namespace CryptoExchange.Net.Objects
@@ -45,7 +44,7 @@ namespace CryptoExchange.Net.Objects
        /// <summary>
        /// Logger
        /// </summary>
-        public Log Log { get; }
+        public ILogger Logger { get; }
        /// <summary>
        /// Should synchronize time
        /// </summary>
@@ -62,13 +61,13 @@ namespace CryptoExchange.Net.Objects
        /// <summary>
        /// ctor
        /// </summary>
-        /// <param name="log"></param>
+        /// <param name="logger"></param>
        /// <param name="recalculationInterval"></param>
        /// <param name="syncTime"></param>
        /// <param name="syncState"></param>
-        public TimeSyncInfo(Log log, bool syncTime, TimeSpan recalculationInterval, TimeSyncState syncState)
+        public TimeSyncInfo(ILogger logger, bool syncTime, TimeSpan recalculationInterval, TimeSyncState syncState)
        {
-            Log = log;
+            Logger = logger;
            SyncTime = syncTime;
            RecalculationInterval = recalculationInterval;
            TimeSyncState = syncState;
@@ -83,12 +82,12 @@ namespace CryptoExchange.Net.Objects
            TimeSyncState.LastSyncTime = DateTime.UtcNow;
            if (offset.TotalMilliseconds > 0 && offset.TotalMilliseconds < 500)
            {
-                Log.Write(LogLevel.Information, $"{TimeSyncState.ApiName} Time offset within limits, set offset to 0ms");
+                Logger.Log(LogLevel.Information, $"{TimeSyncState.ApiName} Time offset within limits, set offset to 0ms");
                TimeSyncState.TimeOffset = TimeSpan.Zero;
            }
            else
            {
-                Log.Write(LogLevel.Information, $"{TimeSyncState.ApiName} Time offset set to {Math.Round(offset.TotalMilliseconds)}ms");
+                Logger.Log(LogLevel.Information, $"{TimeSyncState.ApiName} Time offset set to {Math.Round(offset.TotalMilliseconds)}ms");
                TimeSyncState.TimeOffset = offset;
            }
        }
@@ -0,0 +1,63 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Diagnostics;
+
+namespace CryptoExchange.Net.Objects
+{
+    /// <summary>
+    /// Trace logger provider for creating trace loggers
+    /// </summary>
+    public class TraceLoggerProvider : ILoggerProvider
+    {
+        private readonly LogLevel _logLevel;
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="logLevel"></param>
+        public TraceLoggerProvider(LogLevel? logLevel = null)
+        {
+            _logLevel = logLevel ?? LogLevel.Trace;
+        }
+
+        /// <inheritdoc />
+        public ILogger CreateLogger(string categoryName) => new TraceLogger(categoryName, _logLevel);
+        /// <inheritdoc />
+        public void Dispose() { }
+    }
+
+    /// <summary>
+    /// Trace logger
+    /// </summary>
+    public class TraceLogger : ILogger
+    {
+        private string? _categoryName;
+        private LogLevel _logLevel;
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="categoryName"></param>
+        /// <param name="level"></param>
+        public TraceLogger(string? categoryName = null, LogLevel level = LogLevel.Trace)
+        {
+            _categoryName = categoryName;
+            _logLevel = level;
+        }
+
+        /// <inheritdoc />
+        public IDisposable BeginScope<TState>(TState state) => null!;
+
+        /// <inheritdoc />
+        public bool IsEnabled(LogLevel logLevel) => (int)logLevel < (int)_logLevel;
+        /// <inheritdoc />
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
+        {
+            if ((int)logLevel < (int)_logLevel)
+                return;
+
+            var logMessage = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | {logLevel} | {(_categoryName == null ? "" : $"{_categoryName} | ")}{formatter(state, exception)}";
+            Trace.WriteLine(logMessage);
+        }
+    }
+}
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+
+namespace CryptoExchange.Net.Objects
+{
+    /// <summary>
+    /// Trade environment names
+    /// </summary>
+    public static class TradeEnvironmentNames
+    {
+        /// <summary>
+        /// Live environment
+        /// </summary>
+        public const string Live = "live";
+        /// <summary>
+        /// Testnet environment
+        /// </summary>
+        public const string Testnet = "testnet";
+    }
+
+    /// <summary>
+    /// Trade environment. Contains info about URL's to use to connect to the API. To swap environment select another environment for
+    /// the echange's environment list or create a custom environment using either `[Exchange]Environment.CreateCustom()` or `[Exchange]Environment.[Environment]`, for example `KucoinEnvironment.TestNet` or `BinanceEnvironment.Live`
+    /// </summary>
+    public class TradeEnvironment
+    {
+        /// <summary>
+        /// Name of the environment
+        /// </summary>
+        public string EnvironmentName { get; init; }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="name"></param>
+        protected TradeEnvironment(string name)
+        {
+            EnvironmentName = name;
+        }
+    }
+}
@@ -13,14 +13,17 @@ namespace CryptoExchange.Net.OrderBook
        /// First sequence number in this update
        /// </summary>
        public long FirstUpdateId { get; set; }
+
        /// <summary>
        /// Last sequence number in this update
        /// </summary>
        public long LastUpdateId { get; set; }
+
        /// <summary>
        /// List of changed/new asks
        /// </summary>
        public IEnumerable<ISymbolOrderBookEntry> Asks { get; set; } = Array.Empty<ISymbolOrderBookEntry>();
+
        /// <summary>
        /// List of changed/new bids
        /// </summary>
@@ -7,8 +7,8 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Logging;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.Sockets;
 using Microsoft.Extensions.Logging;

@@ -30,7 +30,7 @@ namespace CryptoExchange.Net.OrderBook

        private readonly AsyncResetEvent _queueEvent;
        private readonly ConcurrentQueue<object> _processQueue;
-        private readonly bool _validateChecksum;
+        private bool _validateChecksum;

        private class EmptySymbolOrderBookEntry : ISymbolOrderBookEntry
        {
@@ -40,48 +40,47 @@ namespace CryptoExchange.Net.OrderBook
                set { } }
        }

-        private static readonly ISymbolOrderBookEntry emptySymbolOrderBookEntry = new EmptySymbolOrderBookEntry();
-
+        private static readonly ISymbolOrderBookEntry _emptySymbolOrderBookEntry = new EmptySymbolOrderBookEntry();

        /// <summary>
        /// A buffer to store messages received before the initial book snapshot is processed. These messages
        /// will be processed after the book snapshot is set. Any messages in this buffer with sequence numbers lower
        /// than the snapshot sequence number will be discarded
        /// </summary>
-        protected readonly List<ProcessBufferRangeSequenceEntry> processBuffer;
+        protected readonly List<ProcessBufferRangeSequenceEntry> _processBuffer;

        /// <summary>
        /// The ask list, should only be accessed using the bookLock
        /// </summary>
-        protected SortedList<decimal, ISymbolOrderBookEntry> asks;
+        protected SortedList<decimal, ISymbolOrderBookEntry> _asks;

        /// <summary>
        /// The bid list, should only be accessed using the bookLock
        /// </summary>
-        protected SortedList<decimal, ISymbolOrderBookEntry> bids;
+        protected SortedList<decimal, ISymbolOrderBookEntry> _bids;

        /// <summary>
        /// The log
        /// </summary>
-        protected Log log;
+        protected ILogger _logger;

        /// <summary>
        /// Whether update numbers are consecutive. If set to true and an update comes in which isn't the previous sequences number + 1
        /// the book will resynchronize as it is deemed out of sync
        /// </summary>
-        protected bool sequencesAreConsecutive;
+        protected bool _sequencesAreConsecutive;
        
        /// <summary>
        /// Whether levels should be strictly enforced. For example, when an order book has 25 levels and a new update comes in which pushes
        /// the current level 25 ask out of the top 25, should the curent the level 26 entry be removed from the book or does the 
        /// server handle this
        /// </summary>
-        protected bool strictLevels;
+        protected bool _strictLevels;

        /// <summary>
        /// If the initial snapshot of the book has been set
        /// </summary>
-        protected bool bookSet;
+        protected bool _bookSet;

        /// <summary>
        /// The amount of levels for this book
@@ -102,7 +101,7 @@ namespace CryptoExchange.Net.OrderBook

                var old = _status;
                _status = value;
-                log.Write(LogLevel.Information, $"{Id} order book {Symbol} status changed: {old} => {value}");
+                _logger.Log(LogLevel.Information, $"{Id} order book {Symbol} status changed: {old} => {value}");
                OnStatusChange?.Invoke(old, _status);
            }
        }
@@ -137,7 +136,7 @@ namespace CryptoExchange.Net.OrderBook
            get
            {
                lock (_bookLock)
-                    return asks.Select(a => a.Value).ToList();
+                    return _asks.Select(a => a.Value).ToList();
            }
        }

@@ -147,7 +146,7 @@ namespace CryptoExchange.Net.OrderBook
            get
            {
                lock (_bookLock)
-                    return bids.Select(a => a.Value).ToList();
+                    return _bids.Select(a => a.Value).ToList();
            }
        }

@@ -167,7 +166,7 @@ namespace CryptoExchange.Net.OrderBook
            get
            {
                lock (_bookLock)
-                    return bids.FirstOrDefault().Value ?? emptySymbolOrderBookEntry;
+                    return _bids.FirstOrDefault().Value ?? _emptySymbolOrderBookEntry;
            }
        }

@@ -177,7 +176,7 @@ namespace CryptoExchange.Net.OrderBook
            get
            {
                lock (_bookLock)
-                    return asks.FirstOrDefault().Value ?? emptySymbolOrderBookEntry;
+                    return _asks.FirstOrDefault().Value ?? _emptySymbolOrderBookEntry;
            }
        }

@@ -192,32 +191,39 @@ namespace CryptoExchange.Net.OrderBook
        /// <summary>
        /// ctor
        /// </summary>
+        /// <param name="logger">Logger to use. If not provided will create a TraceLogger</param>
        /// <param name="id">The id of the order book. Should be set to {Exchange}[{type}], for example: Kucoin[Spot]</param>
        /// <param name="symbol">The symbol the order book is for</param>
-        /// <param name="options">The options for the order book</param>
-        protected SymbolOrderBook(string id, string symbol, OrderBookOptions options)
+        protected SymbolOrderBook(ILogger? logger, string id, string symbol)
        {
            if (symbol == null)
                throw new ArgumentNullException(nameof(symbol));

-            if (options == null)
-                throw new ArgumentNullException(nameof(options));
-
            Id = id;
-            processBuffer = new List<ProcessBufferRangeSequenceEntry>();
+            _processBuffer = new List<ProcessBufferRangeSequenceEntry>();
            _processQueue = new ConcurrentQueue<object>();
            _queueEvent = new AsyncResetEvent(false, true);

-            _validateChecksum = options.ChecksumValidationEnabled;
            Symbol = symbol;
            Status = OrderBookStatus.Disconnected;

-            asks = new SortedList<decimal, ISymbolOrderBookEntry>();
-            bids = new SortedList<decimal, ISymbolOrderBookEntry>(new DescComparer<decimal>());
+            _asks = new SortedList<decimal, ISymbolOrderBookEntry>();
+            _bids = new SortedList<decimal, ISymbolOrderBookEntry>(new DescComparer<decimal>());

-            log = new Log(id) { Level = options.LogLevel };
-            var writers = options.LogWriters ?? new List<ILogger> { new DebugLogger() };
-            log.UpdateWriters(writers.ToList());
+            _logger = logger ?? new TraceLogger();
+        }
+
+        /// <summary>
+        /// Initialize the order book using the provided options
+        /// </summary>
+        /// <param name="options">The options</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        protected void Initialize(OrderBookOptions options)
+        {
+            if (options == null)
+                throw new ArgumentNullException(nameof(options));
+
+            _validateChecksum = options.ChecksumValidationEnabled;
        }

        /// <inheritdoc/>
@@ -226,7 +232,7 @@ namespace CryptoExchange.Net.OrderBook
            if (Status != OrderBookStatus.Disconnected)
                throw new InvalidOperationException($"Can't start book unless state is {OrderBookStatus.Disconnected}. Current state: {Status}");

-            log.Write(LogLevel.Debug, $"{Id} order book {Symbol} starting");
+            _logger.Log(LogLevel.Debug, $"{Id} order book {Symbol} starting");
            _cts = new CancellationTokenSource();
            ct?.Register(async () =>
            {
@@ -236,8 +242,8 @@ namespace CryptoExchange.Net.OrderBook

            // Clear any previous messages
            while (_processQueue.TryDequeue(out _)) { }
-            processBuffer.Clear();
-            bookSet = false;
+            _processBuffer.Clear();
+            _bookSet = false;

            Status = OrderBookStatus.Connecting;
            _processTask = Task.Factory.StartNew(ProcessQueue, TaskCreationOptions.LongRunning);
@@ -251,58 +257,70 @@ namespace CryptoExchange.Net.OrderBook

            if (_cts.IsCancellationRequested)
            {
-                log.Write(LogLevel.Debug, $"{Id} order book {Symbol} stopped while starting");
+                _logger.Log(LogLevel.Debug, $"{Id} order book {Symbol} stopped while starting");
                await startResult.Data.CloseAsync().ConfigureAwait(false);
                Status = OrderBookStatus.Disconnected;
                return new CallResult<bool>(new CancellationRequestedError());
            }

            _subscription = startResult.Data;
-            _subscription.ConnectionLost += () =>
-            {
-                log.Write(LogLevel.Warning, $"{Id} order book {Symbol} connection lost");
-                Status = OrderBookStatus.Reconnecting;
-                Reset();
-            };
-            _subscription.ConnectionClosed += () =>
-            {
-                log.Write(LogLevel.Warning, $"{Id} order book {Symbol} disconnected");
-                Status = OrderBookStatus.Disconnected;
-                _ = StopAsync();
-            };
+            _subscription.ConnectionLost += HandleConnectionLost;
+            _subscription.ConnectionClosed += HandleConnectionClosed;
+            _subscription.ConnectionRestored += HandleConnectionRestored;

-            _subscription.ConnectionRestored += async time => await ResyncAsync().ConfigureAwait(false);
            Status = OrderBookStatus.Synced;
            return new CallResult<bool>(true);
        }

+        private void HandleConnectionLost() {
+             _logger.Log(LogLevel.Warning, $"{Id} order book {Symbol} connection lost");
+             if (Status != OrderBookStatus.Disposed) {
+                Status = OrderBookStatus.Reconnecting;
+                Reset();
+            }
+        }
+
+        private void HandleConnectionClosed() {
+            _logger.Log(LogLevel.Warning, $"{Id} order book {Symbol} disconnected");
+            Status = OrderBookStatus.Disconnected;
+            _ = StopAsync();
+        }
+
+        private async void HandleConnectionRestored(TimeSpan _) {
+            await ResyncAsync().ConfigureAwait(false);
+        }
+
        /// <inheritdoc/>
        public async Task StopAsync()
        {
-            log.Write(LogLevel.Debug, $"{Id} order book {Symbol} stopping");
+            _logger.Log(LogLevel.Debug, $"{Id} order book {Symbol} stopping");
            Status = OrderBookStatus.Disconnected;
            _cts?.Cancel();
            _queueEvent.Set();
            if (_processTask != null)
                await _processTask.ConfigureAwait(false);

-            if (_subscription != null)
+            if (_subscription != null) {
                await _subscription.CloseAsync().ConfigureAwait(false);
-            log.Write(LogLevel.Trace, $"{Id} order book {Symbol} stopped");
+                _subscription.ConnectionLost -= HandleConnectionLost;
+                _subscription.ConnectionClosed -= HandleConnectionClosed;
+                _subscription.ConnectionRestored -= HandleConnectionRestored;
+            }
+            _logger.Log(LogLevel.Trace, $"{Id} order book {Symbol} stopped");
        }

        /// <inheritdoc/>
-        public CallResult<decimal> CalculateAverageFillPrice(decimal quantity, OrderBookEntryType type)
+        public CallResult<decimal> CalculateAverageFillPrice(decimal baseQuantity, OrderBookEntryType type)
        {
            if (Status != OrderBookStatus.Synced)
                return new CallResult<decimal>(new InvalidOperationError($"{nameof(CalculateAverageFillPrice)} is not available when book is not in Synced state"));

            var totalCost = 0m;
            var totalAmount = 0m;
-            var amountLeft = quantity;
+            var amountLeft = baseQuantity;
            lock (_bookLock)
            {
-                var list = type == OrderBookEntryType.Ask ? asks : bids;
+                var list = type == OrderBookEntryType.Ask ? _asks : _bids;
                
                var step = 0;
                while (amountLeft > 0)
@@ -322,6 +340,35 @@ namespace CryptoExchange.Net.OrderBook
            return new CallResult<decimal>(Math.Round(totalCost / totalAmount, 8));
        }

+        /// <inheritdoc/>
+        public CallResult<decimal> CalculateTradableAmount(decimal quoteQuantity, OrderBookEntryType type)
+        {
+            if (Status != OrderBookStatus.Synced)
+                return new CallResult<decimal>(new InvalidOperationError($"{nameof(CalculateTradableAmount)} is not available when book is not in Synced state"));
+
+            var quoteQuantityLeft = quoteQuantity;
+            var totalBaseQuantity = 0m;
+            lock (_bookLock)
+            {
+                var list = type == OrderBookEntryType.Ask ? _asks : _bids;
+
+                var step = 0;
+                while (quoteQuantityLeft > 0)
+                {
+                    if (step == list.Count)
+                        return new CallResult<decimal>(new InvalidOperationError("Quantity is larger than order in the order book"));
+
+                    var element = list.ElementAt(step);
+                    var stepAmount = Math.Min(element.Value.Quantity * element.Value.Price, quoteQuantityLeft);
+                    quoteQuantityLeft -= stepAmount;
+                    totalBaseQuantity += stepAmount / element.Value.Price;
+                    step++;
+                }
+            }
+
+            return new CallResult<decimal>(Math.Round(totalBaseQuantity, 8));
+        }
+
        /// <summary>
        /// Implementation for starting the order book. Should typically have logic for subscribing to the update stream and retrieving
        /// and setting the initial order book
@@ -415,14 +462,14 @@ namespace CryptoExchange.Net.OrderBook
        /// </summary>
        protected void CheckProcessBuffer()
        {
-            var pbList = processBuffer.ToList();
+            var pbList = _processBuffer.ToList();
            if (pbList.Count > 0)
-                log.Write(LogLevel.Debug, $"Processing {pbList.Count} buffered updates");
+                _logger.Log(LogLevel.Debug, $"Processing {pbList.Count} buffered updates");

            foreach (var bufferEntry in pbList)
            {
                ProcessRangeUpdates(bufferEntry.FirstUpdateId, bufferEntry.LastUpdateId, bufferEntry.Bids, bufferEntry.Asks);
-                processBuffer.Remove(bufferEntry);
+                _processBuffer.Remove(bufferEntry);
            }
        }

@@ -436,21 +483,21 @@ namespace CryptoExchange.Net.OrderBook
        {
            if (sequence <= LastSequenceNumber)
            {
-                log.Write(LogLevel.Debug, $"{Id} order book {Symbol} update skipped #{sequence}, currently at #{LastSequenceNumber}");
+                _logger.Log(LogLevel.Debug, $"{Id} order book {Symbol} update skipped #{sequence}, currently at #{LastSequenceNumber}");
                return false;
            }

-            if (sequencesAreConsecutive && sequence > LastSequenceNumber + 1)
+            if (_sequencesAreConsecutive && sequence > LastSequenceNumber + 1)
            {
                // Out of sync
-                log.Write(LogLevel.Warning, $"{Id} order book {Symbol} out of sync (expected { LastSequenceNumber + 1}, was {sequence}), reconnecting");
+                _logger.Log(LogLevel.Warning, $"{Id} order book {Symbol} out of sync (expected { LastSequenceNumber + 1}, was {sequence}), reconnecting");
                _stopProcessing = true;
                Resubscribe();
                return false;
            }

            UpdateTime = DateTime.UtcNow;
-            var listToChange = type == OrderBookEntryType.Ask ? asks : bids;
+            var listToChange = type == OrderBookEntryType.Ask ? _asks : _bids;
            if (entry.Quantity == 0)
            {
                if (!listToChange.ContainsKey(entry.Price))
@@ -486,7 +533,7 @@ namespace CryptoExchange.Net.OrderBook
        protected async Task<CallResult<bool>> WaitForSetOrderBookAsync(TimeSpan timeout, CancellationToken ct)
        {
            var startWait = DateTime.UtcNow;
-            while (!bookSet && Status == OrderBookStatus.Syncing)
+            while (!_bookSet && Status == OrderBookStatus.Syncing)
            {
                if(ct.IsCancellationRequested)
                    return new CallResult<bool>(new CancellationRequestedError());
@@ -528,9 +575,9 @@ namespace CryptoExchange.Net.OrderBook
            // Clear queue
            while (_processQueue.TryDequeue(out _)) { }

-            processBuffer.Clear();
-            asks.Clear();
-            bids.Clear();
+            _processBuffer.Clear();
+            _asks.Clear();
+            _bids.Clear();
            AskCount = 0;
            BidCount = 0;

@@ -569,7 +616,9 @@ namespace CryptoExchange.Net.OrderBook
            var (bestBid, bestAsk) = BestOffers;
            if (bestBid.Price != prevBestBid.Price || bestBid.Quantity != prevBestBid.Quantity ||
                   bestAsk.Price != prevBestAsk.Price || bestAsk.Quantity != prevBestAsk.Quantity)
+            {
                OnBestOffersChanged?.Invoke((bestBid, bestAsk));
+            }
        }

        private void Reset()
@@ -577,8 +626,8 @@ namespace CryptoExchange.Net.OrderBook
            _queueEvent.Set();
            // Clear queue
            while (_processQueue.TryDequeue(out _)) { }
-            processBuffer.Clear();
-            bookSet = false;
+            _processBuffer.Clear();
+            _bookSet = false;
            DoReset();
        }

@@ -595,24 +644,24 @@ namespace CryptoExchange.Net.OrderBook
                success = resyncResult;
            }

-            log.Write(LogLevel.Information, $"{Id} order book {Symbol} successfully resynchronized");
+            _logger.Log(LogLevel.Information, $"{Id} order book {Symbol} successfully resynchronized");
            Status = OrderBookStatus.Synced;
        }

        private async Task ProcessQueue()
        {
-            while (Status != OrderBookStatus.Disconnected)
+            while (Status != OrderBookStatus.Disconnected && Status != OrderBookStatus.Disposed)
            {
                await _queueEvent.WaitAsync().ConfigureAwait(false);

                while (_processQueue.TryDequeue(out var item))
                {
-                    if (Status == OrderBookStatus.Disconnected)
+                    if (Status == OrderBookStatus.Disconnected || Status == OrderBookStatus.Disposed)
                        break;

                    if (_stopProcessing)
                    {
-                        log.Write(LogLevel.Trace, "Skipping message because of resubscribing");
+                        _logger.Log(LogLevel.Trace, "Skipping message because of resubscribing");
                        continue;
                    }

@@ -630,21 +679,21 @@ namespace CryptoExchange.Net.OrderBook
        {
            lock (_bookLock)
            {
-                bookSet = true;
-                asks.Clear();
+                _bookSet = true;
+                _asks.Clear();
                foreach (var ask in item.Asks)
-                    asks.Add(ask.Price, ask);
-                bids.Clear();
+                    _asks.Add(ask.Price, ask);
+                _bids.Clear();
                foreach (var bid in item.Bids)
-                    bids.Add(bid.Price, bid);
+                    _bids.Add(bid.Price, bid);

                LastSequenceNumber = item.EndUpdateId;

-                AskCount = asks.Count;
-                BidCount = bids.Count;
+                AskCount = _asks.Count;
+                BidCount = _bids.Count;

                UpdateTime = DateTime.UtcNow;
-                log.Write(LogLevel.Debug, $"{Id} order book {Symbol} data set: {BidCount} bids, {AskCount} asks. #{item.EndUpdateId}");
+                _logger.Log(LogLevel.Debug, $"{Id} order book {Symbol} data set: {BidCount} bids, {AskCount} asks. #{item.EndUpdateId}");
                CheckProcessBuffer();
                OnOrderBookUpdate?.Invoke((item.Bids, item.Asks));
                OnBestOffersChanged?.Invoke((BestBid, BestAsk));
@@ -655,16 +704,16 @@ namespace CryptoExchange.Net.OrderBook
        {
            lock (_bookLock)
            {
-                if (!bookSet)
+                if (!_bookSet)
                {
-                    processBuffer.Add(new ProcessBufferRangeSequenceEntry()
+                    _processBuffer.Add(new ProcessBufferRangeSequenceEntry()
                    {
                        Asks = item.Asks,
                        Bids = item.Bids,
                        FirstUpdateId = item.StartUpdateId,
                        LastUpdateId = item.EndUpdateId,
                    });
-                    log.Write(LogLevel.Trace, $"{Id} order book {Symbol} update buffered #{item.StartUpdateId}-#{item.EndUpdateId} [{item.Asks.Count()} asks, {item.Bids.Count()} bids]");
+                    _logger.Log(LogLevel.Trace, $"{Id} order book {Symbol} update buffered #{item.StartUpdateId}-#{item.EndUpdateId} [{item.Asks.Count()} asks, {item.Bids.Count()} bids]");
                }
                else
                {
@@ -672,12 +721,12 @@ namespace CryptoExchange.Net.OrderBook
                    var (prevBestBid, prevBestAsk) = BestOffers;
                    ProcessRangeUpdates(item.StartUpdateId, item.EndUpdateId, item.Bids, item.Asks);

-                    if (!asks.Any() || !bids.Any())
+                    if (!_asks.Any() || !_bids.Any())
                        return;

-                    if (asks.First().Key < bids.First().Key)
+                    if (_asks.First().Key < _bids.First().Key)
                    {
-                        log.Write(LogLevel.Warning, $"{Id} order book {Symbol} detected out of sync order book. First ask: {asks.First().Key}, first bid: {bids.First().Key}. Resyncing");
+                        _logger.Log(LogLevel.Warning, $"{Id} order book {Symbol} detected out of sync order book. First ask: {_asks.First().Key}, first bid: {_bids.First().Key}. Resyncing");
                        _stopProcessing = true;
                        Resubscribe();
                        return;
@@ -711,7 +760,7 @@ namespace CryptoExchange.Net.OrderBook

                if (!checksumResult)
                {
-                    log.Write(LogLevel.Warning, $"{Id} order book {Symbol} out of sync. Resyncing");
+                    _logger.Log(LogLevel.Warning, $"{Id} order book {Symbol} out of sync. Resyncing");
                    _stopProcessing = true;
                    Resubscribe();
                }
@@ -735,12 +784,14 @@ namespace CryptoExchange.Net.OrderBook
                if (!await _subscription!.ResubscribeAsync().ConfigureAwait(false))
                {
                    // Resubscribing failed, reconnect the socket
-                    log.Write(LogLevel.Warning, $"{Id} order book {Symbol} resync failed, reconnecting socket");
+                    _logger.Log(LogLevel.Warning, $"{Id} order book {Symbol} resync failed, reconnecting socket");
                    Status = OrderBookStatus.Reconnecting;
                    _ = _subscription!.ReconnectAsync();
                }
                else
+                {
                    await ResyncAsync().ConfigureAwait(false);
+                }
            });
        }

@@ -748,7 +799,7 @@ namespace CryptoExchange.Net.OrderBook
        {
            if (lastUpdateId <= LastSequenceNumber)
            {
-                log.Write(LogLevel.Trace, $"{Id} order book {Symbol} update skipped #{firstUpdateId}-{lastUpdateId}");
+                _logger.Log(LogLevel.Trace, $"{Id} order book {Symbol} update skipped #{firstUpdateId}-{lastUpdateId}");
                return;
            }

@@ -758,23 +809,23 @@ namespace CryptoExchange.Net.OrderBook
            foreach (var entry in asks)
                ProcessUpdate(LastSequenceNumber + 1, OrderBookEntryType.Ask, entry);

-            if (Levels.HasValue && strictLevels)
+            if (Levels.HasValue && _strictLevels)
            {
-                while (this.bids.Count > Levels.Value)
+                while (this._bids.Count > Levels.Value)
                {
                    BidCount--;
-                    this.bids.Remove(this.bids.Last().Key);
+                    this._bids.Remove(this._bids.Last().Key);
                }

-                while (this.asks.Count > Levels.Value)
+                while (this._asks.Count > Levels.Value)
                {
                    AskCount--;
-                    this.asks.Remove(this.asks.Last().Key);
+                    this._asks.Remove(this._asks.Last().Key);
                }
            }

            LastSequenceNumber = lastUpdateId;
-            log.Write(LogLevel.Trace, $"{Id} order book {Symbol} update processed #{firstUpdateId}-{lastUpdateId}");
+            _logger.Log(LogLevel.Trace, $"{Id} order book {Symbol} update processed #{firstUpdateId}-{lastUpdateId}");
        }        
    }

@@ -15,8 +15,8 @@ namespace CryptoExchange.Net.Requests
    /// </summary>
    public class Request : IRequest
    {
-        private readonly HttpRequestMessage request;
-        private readonly HttpClient httpClient;
+        private readonly HttpRequestMessage _request;
+        private readonly HttpClient _httpClient;

        /// <summary>
        /// Create request object for web request
@@ -26,8 +26,8 @@ namespace CryptoExchange.Net.Requests
        /// <param name="requestId"></param>        
        public Request(HttpRequestMessage request, HttpClient client, int requestId)
        {
-            httpClient = client;
-            this.request = request;
+            _httpClient = client;
+            _request = request;
            RequestId = requestId;
        }
        
@@ -37,18 +37,18 @@ namespace CryptoExchange.Net.Requests
        /// <inheritdoc />
        public string Accept
        {
-            set => request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(value));
+            set => _request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(value));
        }

        /// <inheritdoc />
        public HttpMethod Method
        {
-            get => request.Method;
-            set => request.Method = value;
+            get => _request.Method;
+            set => _request.Method = value;
        }

        /// <inheritdoc />
-        public Uri Uri => request.RequestUri;
+        public Uri Uri => _request.RequestUri;

        /// <inheritdoc />
        public int RequestId { get; }
@@ -57,31 +57,31 @@ namespace CryptoExchange.Net.Requests
        public void SetContent(string data, string contentType)
        {
            Content = data;
-            request.Content = new StringContent(data, Encoding.UTF8, contentType);
+            _request.Content = new StringContent(data, Encoding.UTF8, contentType);
        }

        /// <inheritdoc />
        public void AddHeader(string key, string value)
        {
-            request.Headers.Add(key, value);
+            _request.Headers.Add(key, value);
        }

        /// <inheritdoc />
        public Dictionary<string, IEnumerable<string>> GetHeaders()
        {
-            return request.Headers.ToDictionary(h => h.Key, h => h.Value);
+            return _request.Headers.ToDictionary(h => h.Key, h => h.Value);
        }

        /// <inheritdoc />
        public void SetContent(byte[] data)
        {
-            request.Content = new ByteArrayContent(data);
+            _request.Content = new ByteArrayContent(data);
        }

        /// <inheritdoc />
        public async Task<IResponse> GetResponseAsync(CancellationToken cancellationToken)
        {
-            return new Response(await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false));
+            return new Response(await _httpClient.SendAsync(_request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false));
        }
    }
 }
@@ -1,8 +1,10 @@
 using System;
 using System.Net;
 using System.Net.Http;
+using System.Runtime.InteropServices;
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;

 namespace CryptoExchange.Net.Requests
 {
@@ -11,37 +13,39 @@ namespace CryptoExchange.Net.Requests
    /// </summary>
    public class RequestFactory : IRequestFactory
    {
-        private HttpClient? httpClient;        
+        private HttpClient? _httpClient;        

        /// <inheritdoc />
-        public void Configure(TimeSpan requestTimeout, ApiProxy? proxy, HttpClient? client = null)
+        public void Configure(ApiProxy? proxy, TimeSpan requestTimeout, HttpClient? client = null)
        {
            if (client == null)
            {
-                HttpMessageHandler handler = new HttpClientHandler()
+                var handler = new HttpClientHandler();
+                if (proxy != null)
                {
-                    Proxy = proxy == null ? null : new WebProxy
+                    handler.Proxy = new WebProxy
                    {
                        Address = new Uri($"{proxy.Host}:{proxy.Port}"),
                        Credentials = proxy.Password == null ? null : new NetworkCredential(proxy.Login, proxy.Password)
-                    }
-                };
+                    };
+                }

-                httpClient = new HttpClient(handler) { Timeout = requestTimeout };
-            }
-            else
-            {
-                httpClient = client;                
+                client = new HttpClient(handler)
+                {
+                    Timeout = requestTimeout
+                };
            }
+
+            _httpClient = client;
        }

        /// <inheritdoc />
        public IRequest Create(HttpMethod method, Uri uri, int requestId)
        {
-            if (httpClient == null)
+            if (_httpClient == null)
                throw new InvalidOperationException("Cant create request before configuring http client");

-            return new Request(new HttpRequestMessage(method, uri), httpClient, requestId);
+            return new Request(new HttpRequestMessage(method, uri), _httpClient, requestId);
        }
    }
 }
@@ -12,16 +12,19 @@ namespace CryptoExchange.Net.Requests
    /// </summary>
    internal class Response : IResponse
    {
-        private readonly HttpResponseMessage response;
+        private readonly HttpResponseMessage _response;

        /// <inheritdoc />
-        public HttpStatusCode StatusCode => response.StatusCode;
+        public HttpStatusCode StatusCode => _response.StatusCode;

        /// <inheritdoc />
-        public bool IsSuccessStatusCode => response.IsSuccessStatusCode;
+        public bool IsSuccessStatusCode => _response.IsSuccessStatusCode;

        /// <inheritdoc />
-        public IEnumerable<KeyValuePair<string, IEnumerable<string>>> ResponseHeaders => response.Headers;
+        public long? ContentLength => _response.Content.Headers.ContentLength;
+
+        /// <inheritdoc />
+        public IEnumerable<KeyValuePair<string, IEnumerable<string>>> ResponseHeaders => _response.Headers;

        /// <summary>
        /// Create response for a http response message
@@ -29,19 +32,19 @@ namespace CryptoExchange.Net.Requests
        /// <param name="response">The actual response</param>
        public Response(HttpResponseMessage response)
        {
-            this.response = response;
+            this._response = response;
        }

        /// <inheritdoc />
        public async Task<Stream> GetResponseStreamAsync()
        {
-            return await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+            return await _response.Content.ReadAsStreamAsync().ConfigureAwait(false);
        }

        /// <inheritdoc />
        public void Close()
        {
-            response.Dispose();
+            _response.Dispose();
        }
    }
 }
@@ -1,17 +1,13 @@
 using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Logging;
 using CryptoExchange.Net.Objects;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.WebSockets;
-using System.Security.Authentication;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;

@@ -22,18 +18,32 @@ namespace CryptoExchange.Net.Sockets
    /// </summary>
    public class CryptoExchangeWebSocketClient : IWebsocket
    {
-        internal static int lastStreamId;
-        private static readonly object streamIdLock = new();
+        enum ProcessState
+        {
+            Idle,
+            Processing,
+            WaitingForClose,
+            Reconnecting
+        }
+
+        internal static int _lastStreamId;
+        private static readonly object _streamIdLock = new();

-        private ClientWebSocket _socket;
        private readonly AsyncResetEvent _sendEvent;
        private readonly ConcurrentQueue<byte[]> _sendBuffer;
-        private readonly IDictionary<string, string> cookies;
-        private readonly IDictionary<string, string> headers;
-        private CancellationTokenSource _ctsSource;
-
+        private readonly SemaphoreSlim _closeSem;
        private readonly List<DateTime> _outgoingMessages;
+
+        private ClientWebSocket _socket;
+        private CancellationTokenSource _ctsSource;
        private DateTime _lastReceivedMessagesUpdate;
+        private Task? _processTask;
+        private Task? _closeTask;
+        private bool _stopRequested;
+        private bool _disposed;
+        private ProcessState _processState;
+        private DateTime _lastReconnectTime;
+

        /// <summary>
        /// Received messages, the size and the timstamp
@@ -48,48 +58,21 @@ namespace CryptoExchange.Net.Sockets
        /// <summary>
        /// Log
        /// </summary>
-        protected Log log;
-
-        /// <summary>
-        /// Handlers for when an error happens on the socket
-        /// </summary>
-        protected readonly List<Action<Exception>> errorHandlers = new();
-        /// <summary>
-        /// Handlers for when the socket connection is opened
-        /// </summary>
-        protected readonly List<Action> openHandlers = new();
-        /// <summary>
-        /// Handlers for when the connection is closed
-        /// </summary>
-        protected readonly List<Action> closeHandlers = new();
-        /// <summary>
-        /// Handlers for when a message is received
-        /// </summary>
-        protected readonly List<Action<string>> messageHandlers = new();
+        protected ILogger _logger;

        /// <inheritdoc />
        public int Id { get; }

        /// <inheritdoc />
-        public string? Origin { get; set; }
+        public WebSocketParameters Parameters { get; }

        /// <summary>
        /// The timestamp this socket has been active for the last time
        /// </summary>
        public DateTime LastActionTime { get; private set; }
-
-        /// <summary>
-        /// Delegate used for processing byte data received from socket connections before it is processed by handlers
-        /// </summary>
-        public Func<byte[], string>? DataInterpreterBytes { get; set; }
-
-        /// <summary>
-        /// Delegate used for processing string data received from socket connections before it is processed by handlers
-        /// </summary>
-        public Func<string, string>? DataInterpreterString { get; set; }
-
+        
        /// <inheritdoc />
-        public Uri Uri { get; }
+        public Uri Uri => Parameters.Uri;

        /// <inheritdoc />
        public bool IsClosed => _socket.State == WebSocketState.Closed;
@@ -97,31 +80,6 @@ namespace CryptoExchange.Net.Sockets
        /// <inheritdoc />
        public bool IsOpen => _socket.State == WebSocketState.Open && !_ctsSource.IsCancellationRequested;

-        /// <summary>
-        /// Ssl protocols supported. NOT USED BY THIS IMPLEMENTATION
-        /// </summary>
-        public SslProtocols SSLProtocols { get; set; }
-
-        private Encoding _encoding = Encoding.UTF8;
-        /// <inheritdoc />
-        public Encoding? Encoding
-        {
-            get => _encoding;
-            set
-            {
-                if(value != null)
-                    _encoding = value;
-            }
-        }
-
-        /// <summary>
-        /// The max amount of outgoing messages per second
-        /// </summary>
-        public int? RatelimitPerSecond { get; set; }
-
-        /// <inheritdoc />
-        public TimeSpan Timeout { get; set; }
-
        /// <inheritdoc />
        public double IncomingKbps
        {
@@ -140,57 +98,36 @@ namespace CryptoExchange.Net.Sockets
        }

        /// <inheritdoc />
-        public event Action OnClose
-        {
-            add => closeHandlers.Add(value);
-            remove => closeHandlers.Remove(value);
-        }
+        public event Action? OnClose;

        /// <inheritdoc />
-        public event Action<string> OnMessage
-        {
-            add => messageHandlers.Add(value);
-            remove => messageHandlers.Remove(value);
-        }
+        public event Action<string>? OnMessage;

        /// <inheritdoc />
-        public event Action<Exception> OnError
-        {
-            add => errorHandlers.Add(value);
-            remove => errorHandlers.Remove(value);
-        }
+        public event Action<Exception>? OnError;

        /// <inheritdoc />
-        public event Action OnOpen
-        {
-            add => openHandlers.Add(value);
-            remove => openHandlers.Remove(value);
-        }
+        public event Action? OnOpen;
+
+        /// <inheritdoc />
+        public event Action? OnReconnecting;
+
+        /// <inheritdoc />
+        public event Action? OnReconnected;
+        /// <inheritdoc />
+        public Func<Task<Uri?>>? GetReconnectionUrl { get; set; }

        /// <summary>
        /// ctor
        /// </summary>
-        /// <param name="log">The log object to use</param>
-        /// <param name="uri">The uri the socket should connect to</param>
-        public CryptoExchangeWebSocketClient(Log log, Uri uri) : this(log, uri, new Dictionary<string, string>(), new Dictionary<string, string>())
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="log">The log object to use</param>
-        /// <param name="uri">The uri the socket should connect to</param>
-        /// <param name="cookies">Cookies to sent in the socket connection request</param>
-        /// <param name="headers">Headers to sent in the socket connection request</param>
-        public CryptoExchangeWebSocketClient(Log log, Uri uri, IDictionary<string, string> cookies, IDictionary<string, string> headers)
+        /// <param name="logger">The log object to use</param>
+        /// <param name="websocketParameters">The parameters for this socket</param>
+        public CryptoExchangeWebSocketClient(ILogger logger, WebSocketParameters websocketParameters)
        {
            Id = NextStreamId();
-            this.log = log;
-            Uri = uri;
-            this.cookies = cookies;
-            this.headers = headers;
+            _logger = logger;

+            Parameters = websocketParameters;
            _outgoingMessages = new List<DateTime>();
            _receivedMessages = new List<ReceiveItem>();
            _sendEvent = new AsyncResetEvent();
@@ -198,84 +135,209 @@ namespace CryptoExchange.Net.Sockets
            _ctsSource = new CancellationTokenSource();
            _receivedMessagesLock = new object();

+            _closeSem = new SemaphoreSlim(1, 1);
            _socket = CreateSocket();
        }

-        /// <inheritdoc />
-        public virtual void SetProxy(ApiProxy proxy)
-        {
-            if (!Uri.TryCreate($"{proxy.Host}:{proxy.Port}", UriKind.Absolute, out var uri))
-                throw new ArgumentException("Proxy settings invalid, {proxy.Host}:{proxy.Port} not a valid URI", nameof(proxy));
-
-            _socket.Options.Proxy = uri?.Scheme == null
-                ? _socket.Options.Proxy = new WebProxy(proxy.Host, proxy.Port)
-                : _socket.Options.Proxy = new WebProxy
-                {
-                    Address = uri
-                };
-
-            if (proxy.Login != null)
-                _socket.Options.Proxy.Credentials = new NetworkCredential(proxy.Login, proxy.Password);
-        }
-
        /// <inheritdoc />
        public virtual async Task<bool> ConnectAsync()
        {
-            log.Write(LogLevel.Debug, $"Socket {Id} connecting");
+            if (!await ConnectInternalAsync().ConfigureAwait(false))
+                return false;
+            
+            OnOpen?.Invoke();
+            _processTask = ProcessAsync();
+            return true;            
+        }
+
+        /// <summary>
+        /// Create the socket object
+        /// </summary>
+        private ClientWebSocket CreateSocket()
+        {
+            var cookieContainer = new CookieContainer();
+            foreach (var cookie in Parameters.Cookies)
+                cookieContainer.Add(new Cookie(cookie.Key, cookie.Value));
+
+            var socket = new ClientWebSocket();
            try
            {
-                using CancellationTokenSource tcs = new(TimeSpan.FromSeconds(10));                
+                socket.Options.Cookies = cookieContainer;
+                foreach (var header in Parameters.Headers)
+                    socket.Options.SetRequestHeader(header.Key, header.Value);
+                socket.Options.KeepAliveInterval = Parameters.KeepAliveInterval ?? TimeSpan.Zero;
+                socket.Options.SetBuffer(65536, 65536); // Setting it to anything bigger than 65536 throws an exception in .net framework
+                if (Parameters.Proxy != null)
+                    SetProxy(socket, Parameters.Proxy);
+            }
+            catch (PlatformNotSupportedException)
+            {
+                // Options are not supported on certain platforms (WebAssembly for instance)
+                // best we can do it try to connect without setting options.
+            }
+
+            return socket;
+        }
+
+        private async Task<bool> ConnectInternalAsync()
+        {
+            _logger.Log(LogLevel.Debug, $"Socket {Id} connecting");
+            try
+            {
+                using CancellationTokenSource tcs = new(TimeSpan.FromSeconds(10));
                await _socket.ConnectAsync(Uri, tcs.Token).ConfigureAwait(false);
-                
-                Handle(openHandlers);
            }
            catch (Exception e)
            {
-                log.Write(LogLevel.Debug, $"Socket {Id} connection failed: " + e.ToLogString());
+                _logger.Log(LogLevel.Debug, $"Socket {Id} connection failed: " + e.ToLogString());
                return false;
            }
-    
-            log.Write(LogLevel.Debug, $"Socket {Id} connected to {Uri}");
+
+            _logger.Log(LogLevel.Debug, $"Socket {Id} connected to {Uri}");
            return true;
        }

        /// <inheritdoc />
-        public virtual async Task ProcessAsync()
+        private async Task ProcessAsync()
        {
-            log.Write(LogLevel.Trace, $"Socket {Id} ProcessAsync started");
-            var sendTask = SendLoopAsync();
-            var receiveTask = ReceiveLoopAsync();
-            var timeoutTask = Timeout != default ? CheckTimeoutAsync() : Task.CompletedTask;
-            log.Write(LogLevel.Trace, $"Socket {Id} processing startup completed");
-            await Task.WhenAll(sendTask, receiveTask, timeoutTask).ConfigureAwait(false);
-            log.Write(LogLevel.Trace, $"Socket {Id} ProcessAsync finished");
+            while (!_stopRequested)
+            {
+                _logger.Log(LogLevel.Debug, $"Socket {Id} starting processing tasks");
+                _processState = ProcessState.Processing;
+                var sendTask = SendLoopAsync();
+                var receiveTask = ReceiveLoopAsync();
+                var timeoutTask = Parameters.Timeout != null && Parameters.Timeout > TimeSpan.FromSeconds(0) ? CheckTimeoutAsync() : Task.CompletedTask;
+                await Task.WhenAll(sendTask, receiveTask, timeoutTask).ConfigureAwait(false);
+                _logger.Log(LogLevel.Debug, $"Socket {Id} processing tasks finished");
+
+                _processState = ProcessState.WaitingForClose;
+                while (_closeTask == null)
+                    await Task.Delay(50).ConfigureAwait(false);
+
+                await _closeTask.ConfigureAwait(false);
+                _closeTask = null;
+
+                if (!Parameters.AutoReconnect)
+                {
+                    _processState = ProcessState.Idle;
+                    OnClose?.Invoke();
+                    return;
+                }    
+
+                if (!_stopRequested)
+                {
+                    _processState = ProcessState.Reconnecting;
+                    OnReconnecting?.Invoke();                    
+                }
+
+                var sinceLastReconnect = DateTime.UtcNow - _lastReconnectTime;
+                if (sinceLastReconnect < Parameters.ReconnectInterval)
+                    await Task.Delay(Parameters.ReconnectInterval - sinceLastReconnect).ConfigureAwait(false);
+
+                while (!_stopRequested)
+                {
+                    _logger.Log(LogLevel.Debug, $"Socket {Id} attempting to reconnect");
+                    var task = GetReconnectionUrl?.Invoke();
+                    if (task != null)
+                    {
+                        var reconnectUri = await task.ConfigureAwait(false);
+                        if (reconnectUri != null && Parameters.Uri != reconnectUri)
+                        {
+                            _logger.Log(LogLevel.Debug, $"Socket {Id} reconnect URI set to {reconnectUri}");
+                            Parameters.Uri = reconnectUri;
+                        }
+                    }
+
+                    _socket = CreateSocket();
+                    _ctsSource.Dispose();
+                    _ctsSource = new CancellationTokenSource();
+                    while (_sendBuffer.TryDequeue(out _)) { } // Clear send buffer
+
+                    var connected = await ConnectInternalAsync().ConfigureAwait(false);
+                    if (!connected)
+                    {
+                        await Task.Delay(Parameters.ReconnectInterval).ConfigureAwait(false);
+                        continue;
+                    }
+
+                    _lastReconnectTime = DateTime.UtcNow;
+                    OnReconnected?.Invoke();
+                    break;
+                }
+            }
+
+            _processState = ProcessState.Idle;
        }

        /// <inheritdoc />
        public virtual void Send(string data)
        {
            if (_ctsSource.IsCancellationRequested)
-                throw new InvalidOperationException($"Socket {Id} Can't send data when socket is not connected");
+                return;

-            var bytes = _encoding.GetBytes(data);
-            log.Write(LogLevel.Trace, $"Socket {Id} Adding {bytes.Length} to sent buffer");
+            var bytes = Parameters.Encoding.GetBytes(data);
+            _logger.Log(LogLevel.Trace, $"Socket {Id} Adding {bytes.Length} to sent buffer");
            _sendBuffer.Enqueue(bytes);
            _sendEvent.Set();
        }

+        /// <inheritdoc />
+        public virtual async Task ReconnectAsync()
+        {
+            if (_processState != ProcessState.Processing && IsOpen)
+                return;
+
+            _logger.Log(LogLevel.Debug, $"Socket {Id} reconnect requested");
+            _closeTask = CloseInternalAsync();
+            await _closeTask.ConfigureAwait(false);
+        }
+
        /// <inheritdoc />
        public virtual async Task CloseAsync()
        {
-            log.Write(LogLevel.Debug, $"Socket {Id} closing");
-            await CloseInternalAsync().ConfigureAwait(false);
+            await _closeSem.WaitAsync().ConfigureAwait(false);
+            _stopRequested = true;
+
+            try
+            {
+                if (_closeTask?.IsCompleted == false)
+                {
+                    _logger.Log(LogLevel.Debug, $"Socket {Id} CloseAsync() waiting for existing close task");
+                    await _closeTask.ConfigureAwait(false);
+                    return;
+                }
+
+                if (!IsOpen)
+                {
+                    _logger.Log(LogLevel.Debug, $"Socket {Id} CloseAsync() socket not open");
+                    return;
+                }
+
+                _logger.Log(LogLevel.Debug, $"Socket {Id} closing");
+                _closeTask = CloseInternalAsync();
+            }
+            finally
+            {
+                _closeSem.Release();
+            }
+
+            await _closeTask.ConfigureAwait(false);
+            if(_processTask != null)
+                await _processTask.ConfigureAwait(false);
+            OnClose?.Invoke();
+            _logger.Log(LogLevel.Debug, $"Socket {Id} closed");
        }
-        
+
        /// <summary>
        /// Internal close method
        /// </summary>
        /// <returns></returns>
        private async Task CloseInternalAsync()
        {
+            if (_disposed)
+                return;
+
+            //_closeState = CloseState.Closing;
            _ctsSource.Cancel();
            _sendEvent.Set();

@@ -285,11 +347,26 @@ namespace CryptoExchange.Net.Sockets
                {
                    await _socket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "Closing", default).ConfigureAwait(false);
                }
-                catch(Exception)
-                { } // Can sometimes throw an exception when socket is in aborted state due to timing
+                catch (Exception)
+                {
+                    // Can sometimes throw an exception when socket is in aborted state due to timing
+                    // Websocket is set to Aborted state when the cancelation token is set during SendAsync/ReceiveAsync
+                    // So socket might go to aborted state, might still be open
+                }
+            }
+            else if(_socket.State == WebSocketState.CloseReceived)
+            {
+                try
+                {
+                    await _socket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Closing", default).ConfigureAwait(false);
+                }
+                catch (Exception)
+                {
+                    // Can sometimes throw an exception when socket is in aborted state due to timing
+                    // Websocket is set to Aborted state when the cancelation token is set during SendAsync/ReceiveAsync
+                    // So socket might go to aborted state, might still be open
+                }
            }
-            log.Write(LogLevel.Debug, $"Socket {Id} closed");
-            Handle(closeHandlers);
        }

        /// <summary>
@@ -297,44 +374,14 @@ namespace CryptoExchange.Net.Sockets
        /// </summary>
        public void Dispose()
        {
-            log.Write(LogLevel.Debug, $"Socket {Id} disposing");
+            if (_disposed)
+                return;
+
+            _logger.Log(LogLevel.Debug, $"Socket {Id} disposing");
+            _disposed = true;
            _socket.Dispose();
            _ctsSource.Dispose();
-
-            errorHandlers.Clear();
-            openHandlers.Clear();
-            closeHandlers.Clear();
-            messageHandlers.Clear();
-            log.Write(LogLevel.Trace, $"Socket {Id} disposed");
-        }
-
-        /// <inheritdoc />
-        public void Reset()
-        {
-            log.Write(LogLevel.Debug, $"Socket {Id} resetting");
-            _ctsSource = new CancellationTokenSource();
-
-            while (_sendBuffer.TryDequeue(out _)) { } // Clear send buffer
-
-            _socket = CreateSocket();
-        }
-        
-        /// <summary>
-        /// Create the socket object
-        /// </summary>
-        private ClientWebSocket CreateSocket()
-        {
-            var cookieContainer = new CookieContainer();
-            foreach (var cookie in cookies)
-                cookieContainer.Add(new Cookie(cookie.Key, cookie.Value));
-
-            var socket = new ClientWebSocket();
-            socket.Options.Cookies = cookieContainer;
-            foreach (var header in headers)
-                socket.Options.SetRequestHeader(header.Key, header.Value);
-            socket.Options.KeepAliveInterval = TimeSpan.FromSeconds(10);
-            socket.Options.SetBuffer(65536, 65536); // Setting it to anything bigger than 65536 throws an exception in .net framework
-            return socket;
+            _logger.Log(LogLevel.Trace, $"Socket {Id} disposed");
        }

        /// <summary>
@@ -357,25 +404,25 @@ namespace CryptoExchange.Net.Sockets

                    while (_sendBuffer.TryDequeue(out var data))
                    {
-                        if (RatelimitPerSecond != null)
+                        if (Parameters.RatelimitPerSecond != null)
                        {
                            // Wait for rate limit
                            DateTime? start = null;
-                            while (MessagesSentLastSecond() >= RatelimitPerSecond)
+                            while (MessagesSentLastSecond() >= Parameters.RatelimitPerSecond)
                            {
                                start ??= DateTime.UtcNow;
                                await Task.Delay(50).ConfigureAwait(false);
                            }

                            if (start != null)
-                                log.Write(LogLevel.Trace, $"Socket {Id} sent delayed {Math.Round((DateTime.UtcNow - start.Value).TotalMilliseconds)}ms because of rate limit");
+                                _logger.Log(LogLevel.Debug, $"Socket {Id} sent delayed {Math.Round((DateTime.UtcNow - start.Value).TotalMilliseconds)}ms because of rate limit");
                        }

                        try
                        {
                            await _socket.SendAsync(new ArraySegment<byte>(data, 0, data.Length), WebSocketMessageType.Text, true, _ctsSource.Token).ConfigureAwait(false);
                            _outgoingMessages.Add(DateTime.UtcNow);
-                            log.Write(LogLevel.Trace, $"Socket {Id} sent {data.Length} bytes");
+                            _logger.Log(LogLevel.Trace, $"Socket {Id} sent {data.Length} bytes");
                        }
                        catch (OperationCanceledException)
                        {
@@ -384,9 +431,10 @@ namespace CryptoExchange.Net.Sockets
                        }
                        catch (Exception ioe)
                        {
-                            // Connection closed unexpectedly, .NET framework                      
-                            Handle(errorHandlers, ioe);
-                            await CloseInternalAsync().ConfigureAwait(false);
+                            // Connection closed unexpectedly, .NET framework
+                            OnError?.Invoke(ioe);
+                            if (_closeTask?.IsCompleted != false)
+                                _closeTask = CloseInternalAsync();
                            break;
                        }
                    }
@@ -397,12 +445,13 @@ namespace CryptoExchange.Net.Sockets
                // Because this is running in a separate task and not awaited until the socket gets closed
                // any exception here will crash the send processing, but do so silently unless the socket get's stopped.
                // Make sure we at least let the owner know there was an error
-                Handle(errorHandlers, e);
+                _logger.Log(LogLevel.Warning, $"Socket {Id} Send loop stopped with exception");
+                OnError?.Invoke(e);
                throw;
            }
            finally
            {
-                log.Write(LogLevel.Trace, $"Socket {Id} Send loop finished");
+                _logger.Log(LogLevel.Debug, $"Socket {Id} Send loop finished");
            }
        }

@@ -440,17 +489,19 @@ namespace CryptoExchange.Net.Sockets
                        }
                        catch (Exception wse)
                        {
-                            // Connection closed unexpectedly        
-                            Handle(errorHandlers, wse);
-                            await CloseInternalAsync().ConfigureAwait(false);
+                            // Connection closed unexpectedly
+                            OnError?.Invoke(wse);
+                            if (_closeTask?.IsCompleted != false)
+                                _closeTask = CloseInternalAsync();
                            break;
                        }

                        if (receiveResult.MessageType == WebSocketMessageType.Close)
                        {
                            // Connection closed unexpectedly        
-                            log.Write(LogLevel.Debug, $"Socket {Id} received `Close` message");
-                            await CloseInternalAsync().ConfigureAwait(false);
+                            _logger.Log(LogLevel.Debug, $"Socket {Id} received `Close` message");
+                            if (_closeTask?.IsCompleted != false)
+                                _closeTask = CloseInternalAsync();
                            break;
                        }

@@ -459,7 +510,7 @@ namespace CryptoExchange.Net.Sockets
                            // We received data, but it is not complete, write it to a memory stream for reassembling
                            multiPartMessage = true;
                            memoryStream ??= new MemoryStream();
-                            log.Write(LogLevel.Trace, $"Socket {Id} received {receiveResult.Count} bytes in partial message");
+                            _logger.Log(LogLevel.Trace, $"Socket {Id} received {receiveResult.Count} bytes in partial message");
                            await memoryStream.WriteAsync(buffer.Array, buffer.Offset, receiveResult.Count).ConfigureAwait(false);
                        }
                        else
@@ -467,13 +518,13 @@ namespace CryptoExchange.Net.Sockets
                            if (!multiPartMessage)
                            {
                                // Received a complete message and it's not multi part
-                                log.Write(LogLevel.Trace, $"Socket {Id} received {receiveResult.Count} bytes in single message");
+                                _logger.Log(LogLevel.Trace, $"Socket {Id} received {receiveResult.Count} bytes in single message");
                                HandleMessage(buffer.Array!, buffer.Offset, receiveResult.Count, receiveResult.MessageType);
                            }
                            else
                            {
                                // Received the end of a multipart message, write to memory stream for reassembling
-                                log.Write(LogLevel.Trace, $"Socket {Id} received {receiveResult.Count} bytes in partial message");
+                                _logger.Log(LogLevel.Trace, $"Socket {Id} received {receiveResult.Count} bytes in partial message");
                                await memoryStream!.WriteAsync(buffer.Array, buffer.Offset, receiveResult.Count).ConfigureAwait(false);
                            }
                            break;
@@ -501,12 +552,12 @@ namespace CryptoExchange.Net.Sockets
                        if (receiveResult?.EndOfMessage == true)
                        {
                            // Reassemble complete message from memory stream
-                            log.Write(LogLevel.Trace, $"Socket {Id} reassembled message of {memoryStream!.Length} bytes");
+                            _logger.Log(LogLevel.Trace, $"Socket {Id} reassembled message of {memoryStream!.Length} bytes");
                            HandleMessage(memoryStream!.ToArray(), 0, (int)memoryStream.Length, receiveResult.MessageType);
                            memoryStream.Dispose();
                        }
                        else
-                            log.Write(LogLevel.Trace, $"Socket {Id} discarding incomplete message of {memoryStream!.Length} bytes");
+                            _logger.Log(LogLevel.Trace, $"Socket {Id} discarding incomplete message of {memoryStream!.Length} bytes");
                    }
                }
            }
@@ -515,12 +566,13 @@ namespace CryptoExchange.Net.Sockets
                // Because this is running in a separate task and not awaited until the socket gets closed
                // any exception here will crash the receive processing, but do so silently unless the socket gets stopped.
                // Make sure we at least let the owner know there was an error
-                Handle(errorHandlers, e);
+                _logger.Log(LogLevel.Warning, $"Socket {Id} Receive loop stopped with exception");
+                OnError?.Invoke(e);
                throw;
            }
            finally
            {
-                log.Write(LogLevel.Trace, $"Socket {Id} Receive loop finished");
+                _logger.Log(LogLevel.Debug, $"Socket {Id} Receive loop finished");
            }
        }

@@ -536,54 +588,92 @@ namespace CryptoExchange.Net.Sockets
            string strData;
            if (messageType == WebSocketMessageType.Binary)
            {
-                if (DataInterpreterBytes == null)
+                if (Parameters.DataInterpreterBytes == null)
                    throw new Exception("Byte interpreter not set while receiving byte data");

                try
                {
                    var relevantData = new byte[count];
                    Array.Copy(data, offset, relevantData, 0, count);
-                    strData = DataInterpreterBytes(relevantData);
+                    strData = Parameters.DataInterpreterBytes(relevantData);
                }
                catch(Exception e)
                {
-                    log.Write(LogLevel.Error, $"Socket {Id} unhandled exception during byte data interpretation: " + e.ToLogString());
+                    _logger.Log(LogLevel.Error, $"Socket {Id} unhandled exception during byte data interpretation: " + e.ToLogString());
                    return;
                }
            }
            else
-                strData = _encoding.GetString(data, offset, count);
+                strData = Parameters.Encoding.GetString(data, offset, count);

-            if (DataInterpreterString != null)
+            if (Parameters.DataInterpreterString != null)
            {
                try
                {
-                    strData = DataInterpreterString(strData);
+                    strData = Parameters.DataInterpreterString(strData);
                }
                catch(Exception e)
                {
-                    log.Write(LogLevel.Error, $"Socket {Id} unhandled exception during string data interpretation: " + e.ToLogString());
+                    _logger.Log(LogLevel.Error, $"Socket {Id} unhandled exception during string data interpretation: " + e.ToLogString());
                    return;
                }
            }

            try
            {
-                Handle(messageHandlers, strData);
+                LastActionTime = DateTime.UtcNow;
+                OnMessage?.Invoke(strData);
            }
            catch(Exception e)
            {
-                log.Write(LogLevel.Error, $"Socket {Id} unhandled exception during message processing: " + e.ToLogString());
+                _logger.Log(LogLevel.Error, $"Socket {Id} unhandled exception during message processing: " + e.ToLogString());
            }
        }

+        /// <summary>
+        /// Trigger the OnMessage event
+        /// </summary>
+        /// <param name="data"></param>
+        protected void TriggerOnMessage(string data)
+        {
+            LastActionTime = DateTime.UtcNow;
+            OnMessage?.Invoke(data);
+        }
+
+        /// <summary>
+        /// Trigger the OnError event
+        /// </summary>
+        /// <param name="ex"></param>
+        protected void TriggerOnError(Exception ex) => OnError?.Invoke(ex);
+
+        /// <summary>
+        /// Trigger the OnError event
+        /// </summary>
+        protected void TriggerOnOpen() => OnOpen?.Invoke();
+
+        /// <summary>
+        /// Trigger the OnError event
+        /// </summary>
+        protected void TriggerOnClose() => OnClose?.Invoke();
+
+        /// <summary>
+        /// Trigger the OnReconnecting event
+        /// </summary>
+        protected void TriggerOnReconnecting() => OnReconnecting?.Invoke();
+
+        /// <summary>
+        /// Trigger the OnReconnected event
+        /// </summary>
+        protected void TriggerOnReconnected() => OnReconnected?.Invoke();
+
        /// <summary>
        /// Checks if there is no data received for a period longer than the specified timeout
        /// </summary>
        /// <returns></returns>
        protected async Task CheckTimeoutAsync()
        {
-            log.Write(LogLevel.Debug, $"Socket {Id} Starting task checking for no data received for {Timeout}");
+            _logger.Log(LogLevel.Debug, $"Socket {Id} Starting task checking for no data received for {Parameters.Timeout}");
+            LastActionTime = DateTime.UtcNow;
            try 
            { 
                while (true)
@@ -591,10 +681,10 @@ namespace CryptoExchange.Net.Sockets
                    if (_ctsSource.IsCancellationRequested)
                        return;

-                    if (DateTime.UtcNow - LastActionTime > Timeout)
+                    if (DateTime.UtcNow - LastActionTime > Parameters.Timeout)
                    {
-                        log.Write(LogLevel.Warning, $"Socket {Id} No data received for {Timeout}, reconnecting socket");
-                        _ = CloseAsync().ConfigureAwait(false);
+                        _logger.Log(LogLevel.Warning, $"Socket {Id} No data received for {Parameters.Timeout}, reconnecting socket");
+                        _ = ReconnectAsync().ConfigureAwait(false);
                        return;
                    }
                    try
@@ -613,45 +703,21 @@ namespace CryptoExchange.Net.Sockets
                // Because this is running in a separate task and not awaited until the socket gets closed
                // any exception here will stop the timeout checking, but do so silently unless the socket get's stopped.
                // Make sure we at least let the owner know there was an error
-                Handle(errorHandlers, e);
+                OnError?.Invoke(e);
                throw;
            }
        }

-        /// <summary>
-        /// Helper to invoke handlers
-        /// </summary>
-        /// <param name="handlers"></param>
-        protected void Handle(List<Action> handlers)
-        {
-            LastActionTime = DateTime.UtcNow;
-            foreach (var handle in new List<Action>(handlers))
-                handle?.Invoke();
-        }
-
-        /// <summary>
-        /// Helper to invoke handlers
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="handlers"></param>
-        /// <param name="data"></param>
-        protected void Handle<T>(List<Action<T>> handlers, T data)
-        {
-            LastActionTime = DateTime.UtcNow;
-            foreach (var handle in new List<Action<T>>(handlers))
-                handle?.Invoke(data);
-        }
-
        /// <summary>
        /// Get the next identifier
        /// </summary>
        /// <returns></returns>
        private static int NextStreamId()
        {
-            lock (streamIdLock)
+            lock (_streamIdLock)
            {
-                lastStreamId++;
-                return lastStreamId;
+                _lastStreamId++;
+                return _lastStreamId;
            }
        }

@@ -671,12 +737,36 @@ namespace CryptoExchange.Net.Sockets
            if (checkTime - _lastReceivedMessagesUpdate > TimeSpan.FromSeconds(1))
            {
                foreach (var msg in _receivedMessages.ToList()) // To list here because we're removing from the list
+                {
                    if (checkTime - msg.Timestamp > TimeSpan.FromSeconds(3))
                        _receivedMessages.Remove(msg);
+                }

                _lastReceivedMessagesUpdate = checkTime;
            }
        }
+
+        /// <summary>
+        /// Set proxy on socket
+        /// </summary>
+        /// <param name="socket"></param>
+        /// <param name="proxy"></param>
+        /// <exception cref="ArgumentException"></exception>
+        protected virtual void SetProxy(ClientWebSocket socket, ApiProxy proxy)
+        {
+            if (!Uri.TryCreate($"{proxy.Host}:{proxy.Port}", UriKind.Absolute, out var uri))
+                throw new ArgumentException("Proxy settings invalid, {proxy.Host}:{proxy.Port} not a valid URI", nameof(proxy));
+
+            socket.Options.Proxy = uri?.Scheme == null
+                ? socket.Options.Proxy = new WebProxy(proxy.Host, proxy.Port)
+                : socket.Options.Proxy = new WebProxy
+                {
+                    Address = uri
+                };
+
+            if (proxy.Login != null)
+                socket.Options.Proxy.Credentials = new NetworkCredential(proxy.Login, proxy.Password);
+        }
    }

    /// <summary>
@@ -12,20 +12,28 @@ namespace CryptoExchange.Net.Sockets
        /// The timestamp the data was received
        /// </summary>
        public DateTime Timestamp { get; set; }
+
        /// <summary>
        /// The topic of the update, what symbol/asset etc..
        /// </summary>
        public string? Topic { get; set; }
+
        /// <summary>
        /// The original data that was received, only available when OutputOriginalData is set to true in the client options
        /// </summary>
        public string? OriginalData { get; set; }
+
        /// <summary>
        /// The received data deserialized into an object
        /// </summary>
        public T Data { get; set; }

-        internal DataEvent(T data, DateTime timestamp)
+        /// <summary>
+        /// Ctor
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="timestamp"></param>
+        public DataEvent(T data, DateTime timestamp)
        {
            Data = data;
            Timestamp = timestamp;
@@ -12,14 +12,17 @@ namespace CryptoExchange.Net.Sockets
        /// The connection the message was received on
        /// </summary>
        public SocketConnection Connection { get; set; }
+
        /// <summary>
        /// The json object of the data
        /// </summary>
        public JToken JsonData { get; set; }
+
        /// <summary>
        /// The originally received string data
        /// </summary>
        public string? OriginalData { get; set; }
+
        /// <summary>
        /// The timestamp of when the data was received
        /// </summary>
@@ -11,31 +11,35 @@ namespace CryptoExchange.Net.Sockets
        public JToken? Result { get; private set; }
        public bool Completed { get; private set; }
        public AsyncResetEvent Event { get; }
+        public DateTime RequestTimestamp { get; set; }
        public TimeSpan Timeout { get; }
+        public SocketSubscription? Subscription { get; }

-        private CancellationTokenSource cts;
+        private CancellationTokenSource _cts;

-        public PendingRequest(Func<JToken, bool> handler, TimeSpan timeout)
+        public PendingRequest(Func<JToken, bool> handler, TimeSpan timeout, SocketSubscription? subscription)
        {
            Handler = handler;
            Event = new AsyncResetEvent(false, false);
            Timeout = timeout;
+            RequestTimestamp = DateTime.UtcNow;
+            Subscription = subscription;

-            cts = new CancellationTokenSource(timeout);
-            cts.Token.Register(Fail, false);
+            _cts = new CancellationTokenSource(timeout);
+            _cts.Token.Register(Fail, false);
        }

        public bool CheckData(JToken data)
        {
-            if (Handler(data))
-            {
-                Result = data;
-                Completed = true;
-                Event.Set();
-                return true;
-            }
+            return Handler(data);
+        }

-            return false;
+        public bool Succeed(JToken data)
+        {
+            Result = data;
+            Completed = true;
+            Event.Set();
+            return true;
        }

        public void Fail()
@@ -3,13 +3,12 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
-using CryptoExchange.Net.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Microsoft.Extensions.Logging;
 using CryptoExchange.Net.Objects;
+using System.Net.WebSockets;

 namespace CryptoExchange.Net.Sockets
 {
@@ -53,14 +52,26 @@ namespace CryptoExchange.Net.Sockets
        /// </summary>
        public int SubscriptionCount
        {
-            get { lock (subscriptionLock)
-                return subscriptions.Count(h => h.UserSubscription); }
+            get { lock (_subscriptionLock)
+                return _subscriptions.Count(h => h.UserSubscription); }
+        }
+
+        /// <summary>
+        /// Get a copy of the current subscriptions
+        /// </summary>
+        public SocketSubscription[] Subscriptions
+        {
+            get
+            {
+                lock (_subscriptionLock)
+                    return _subscriptions.Where(h => h.UserSubscription).ToArray();
+            }
        }

        /// <summary>
        /// If the connection has been authenticated
        /// </summary>
-        public bool Authenticated { get; set; }
+        public bool Authenticated { get; internal set; }

        /// <summary>
        /// If connection is made
@@ -80,28 +91,13 @@ namespace CryptoExchange.Net.Sockets
        /// <summary>
        /// The connection uri
        /// </summary>
-        public Uri Uri => _socket.Uri;
+        public Uri ConnectionUri => _socket.Uri;

        /// <summary>
        /// The API client the connection is for
        /// </summary>
        public SocketApiClient ApiClient { get; set; }

-        /// <summary>
-        /// If the socket should be reconnected upon closing
-        /// </summary>
-        public bool ShouldReconnect { get; set; }
-
-        /// <summary>
-        /// Current reconnect try, reset when a successful connection is made
-        /// </summary>
-        public int ReconnectTry { get; set; }
-
-        /// <summary>
-        /// Current resubscribe try, reset when a successful connection is made
-        /// </summary>
-        public int ResubscribeTry { get; set; }
-
        /// <summary>
        /// Time of disconnecting
        /// </summary>
@@ -110,36 +106,57 @@ namespace CryptoExchange.Net.Sockets
        /// <summary>
        /// Tag for identificaion
        /// </summary>
-        public string? Tag { get; set; }
+        public string Tag { get; set; }
+        
+        /// <summary>
+        /// Additional properties for this connection
+        /// </summary>
+        public Dictionary<string, object> Properties { get; set; }

        /// <summary>
        /// If activity is paused
        /// </summary>
        public bool PausedActivity
        {
-            get => pausedActivity;
+            get => _pausedActivity;
            set
            {
-                if (pausedActivity != value)
+                if (_pausedActivity != value)
                {
-                    pausedActivity = value;
-                    log.Write(LogLevel.Information, $"Socket {SocketId} Paused activity: " + value);
-                    if(pausedActivity) ActivityPaused?.Invoke();
-                    else ActivityUnpaused?.Invoke();
+                    _pausedActivity = value;
+                    _logger.Log(LogLevel.Information, $"Socket {SocketId} Paused activity: " + value);
+                    if(_pausedActivity) _ = Task.Run(() => ActivityPaused?.Invoke());
+                    else _ = Task.Run(() => ActivityUnpaused?.Invoke());
                }
            }
        }

-        private bool pausedActivity;
-        private readonly List<SocketSubscription> subscriptions;
-        private readonly object subscriptionLock = new();
+        /// <summary>
+        /// Status of the socket connection
+        /// </summary>
+        public SocketStatus Status
+        {
+            get => _status;
+            private set
+            {
+                if (_status == value)
+                    return;

-        private bool lostTriggered;
-        private readonly Log log;
-        private readonly BaseSocketClient socketClient;
+                var oldStatus = _status;
+                _status = value;
+                _logger.Log(LogLevel.Debug, $"Socket {SocketId} status changed from {oldStatus} to {_status}");
+            }
+        }

-        private readonly List<PendingRequest> pendingRequests;
-        private Task? _socketProcessReconnectTask;
+        private bool _pausedActivity;
+        private readonly List<SocketSubscription> _subscriptions;
+        private readonly object _subscriptionLock = new();
+
+        private readonly ILogger _logger;
+
+        private readonly List<PendingRequest> _pendingRequests;
+
+        private SocketStatus _status;

        /// <summary>
        /// The underlying websocket
@@ -149,55 +166,223 @@ namespace CryptoExchange.Net.Sockets
        /// <summary>
        /// New socket connection
        /// </summary>
-        /// <param name="client">The socket client</param>
+        /// <param name="logger">The logger</param>
        /// <param name="apiClient">The api client</param>
        /// <param name="socket">The socket</param>
-        public SocketConnection(BaseSocketClient client, SocketApiClient apiClient, IWebsocket socket)
+        /// <param name="tag"></param>
+        public SocketConnection(ILogger logger, SocketApiClient apiClient, IWebsocket socket, string tag)
        {
-            log = client.log;
-            socketClient = client;
+            _logger = logger;
            ApiClient = apiClient;
+            Tag = tag;
+            Properties = new Dictionary<string, object>();

-            pendingRequests = new List<PendingRequest>();
+            _pendingRequests = new List<PendingRequest>();
+            _subscriptions = new List<SocketSubscription>();

-            subscriptions = new List<SocketSubscription>();
            _socket = socket;
-
-            _socket.Timeout = client.ClientOptions.SocketNoDataTimeout;
-            _socket.OnMessage += ProcessMessage;
-            _socket.OnOpen += SocketOnOpen;
+            _socket.OnMessage += HandleMessage;
+            _socket.OnOpen += HandleOpen;
+            _socket.OnClose += HandleClose;
+            _socket.OnReconnecting += HandleReconnecting;
+            _socket.OnReconnected += HandleReconnected;
+            _socket.OnError += HandleError;
+            _socket.GetReconnectionUrl = GetReconnectionUrlAsync;
        }
-        
+
        /// <summary>
-        /// Connect the websocket and start processing
+        /// Handler for a socket opening
+        /// </summary>
+        protected virtual void HandleOpen()
+        {
+            Status = SocketStatus.Connected;
+            PausedActivity = false;
+        }
+
+        /// <summary>
+        /// Handler for a socket closing without reconnect
+        /// </summary>
+        protected virtual void HandleClose()
+        {
+            Status = SocketStatus.Closed;
+            Authenticated = false;
+            lock(_subscriptionLock)
+            {
+                foreach (var sub in _subscriptions)
+                    sub.Confirmed = false;
+            }    
+            Task.Run(() => ConnectionClosed?.Invoke());
+        }
+
+        /// <summary>
+        /// Handler for a socket losing conenction and starting reconnect
+        /// </summary>
+        protected virtual void HandleReconnecting()
+        {
+            Status = SocketStatus.Reconnecting;
+            DisconnectTime = DateTime.UtcNow;
+            Authenticated = false;
+            lock (_subscriptionLock)
+            {
+                foreach (var sub in _subscriptions)
+                    sub.Confirmed = false;
+            }
+
+            _ = Task.Run(() => ConnectionLost?.Invoke());
+        }
+
+        /// <summary>
+        /// Get the url to connect to when reconnecting
        /// </summary>
        /// <returns></returns>
-        public async Task<bool> ConnectAsync()
+        protected virtual async Task<Uri?> GetReconnectionUrlAsync()
        {
-            var connected = await _socket.ConnectAsync().ConfigureAwait(false);
-            if (connected)
-                StartProcessingTask();
-
-            return connected;
+            return await ApiClient.GetReconnectUriAsync(this).ConfigureAwait(false);
        }

+        /// <summary>
+        /// Handler for a socket which has reconnected
+        /// </summary>
+        protected virtual async void HandleReconnected()
+        {
+            Status = SocketStatus.Resubscribing;
+            lock (_pendingRequests)
+            {
+                foreach (var pendingRequest in _pendingRequests.ToList())
+                {
+                    pendingRequest.Fail();
+                    _pendingRequests.Remove(pendingRequest);
+                }
+            }
+
+            var reconnectSuccessful = await ProcessReconnectAsync().ConfigureAwait(false);
+            if (!reconnectSuccessful)
+            {
+                _logger.Log(LogLevel.Warning, $"Failed reconnect processing: {reconnectSuccessful.Error}, reconnecting again");
+                await _socket.ReconnectAsync().ConfigureAwait(false);
+            }
+            else
+            {
+                Status = SocketStatus.Connected;
+                _ = Task.Run(() =>
+                {
+                    ConnectionRestored?.Invoke(DateTime.UtcNow - DisconnectTime!.Value);
+                    DisconnectTime = null;
+                });
+            }
+        }
+
+        /// <summary>
+        /// Handler for an error on a websocket
+        /// </summary>
+        /// <param name="e">The exception</param>
+        protected virtual void HandleError(Exception e)
+        {
+            if (e is WebSocketException wse)
+                _logger.Log(LogLevel.Warning, $"Socket {SocketId} error: Websocket error code {wse.WebSocketErrorCode}, details: " + e.ToLogString());
+            else
+                _logger.Log(LogLevel.Warning, $"Socket {SocketId} error: " + e.ToLogString());
+        }
+
+        /// <summary>
+        /// Process a message received by the socket
+        /// </summary>
+        /// <param name="data">The received data</param>
+        protected virtual void HandleMessage(string data)
+        {
+            var timestamp = DateTime.UtcNow;
+            _logger.Log(LogLevel.Trace, $"Socket {SocketId} received data: " + data);
+            if (string.IsNullOrEmpty(data)) return;
+
+            var tokenData = data.ToJToken(_logger);
+            if (tokenData == null)
+            {
+                data = $"\"{data}\"";
+                tokenData = data.ToJToken(_logger);
+                if (tokenData == null)
+                    return;
+            }
+
+            var handledResponse = false;
+
+            // Remove any timed out requests
+            PendingRequest[] requests;
+            lock (_pendingRequests)
+            {
+                // Remove only timed out requests after 5 minutes have passed so we can still process any 
+                // message coming in after the request timeout
+                _pendingRequests.RemoveAll(r => r.Completed && DateTime.UtcNow - r.RequestTimestamp > TimeSpan.FromMinutes(5));
+                requests = _pendingRequests.ToArray();
+            }
+
+            // Check if this message is an answer on any pending requests
+            foreach (var pendingRequest in requests)
+            {
+
+                if (pendingRequest.CheckData(tokenData))
+                {
+                    lock (_pendingRequests)
+                        _pendingRequests.Remove(pendingRequest);
+
+                    if (pendingRequest.Completed)
+                    {
+                        // Answer to a timed out request, unsub if it is a subscription request
+                        if (pendingRequest.Subscription != null)
+                        {
+                            _logger.Log(LogLevel.Warning, "Received subscription info after request timed out; unsubscribing. Consider increasing the SocketResponseTimout");
+                            _ = ApiClient.UnsubscribeAsync(this, pendingRequest.Subscription).ConfigureAwait(false);
+                        }
+                    }
+                    else
+                    {
+                        pendingRequest.Succeed(tokenData);
+                    }
+
+                    if (!ApiClient.ContinueOnQueryResponse)
+                        return;
+
+                    handledResponse = true;
+                    break;
+                }
+            }
+
+            // Message was not a request response, check data handlers
+            var messageEvent = new MessageEvent(this, tokenData, ApiClient.OutputOriginalData ? data : null, timestamp);
+            var (handled, userProcessTime, subscription) = HandleData(messageEvent);
+            if (!handled && !handledResponse)
+            {
+                if (!ApiClient.UnhandledMessageExpected)
+                    _logger.Log(LogLevel.Warning, $"Socket {SocketId} Message not handled: " + tokenData);
+                UnhandledMessage?.Invoke(tokenData);
+            }
+
+            var total = DateTime.UtcNow - timestamp;
+            if (userProcessTime.TotalMilliseconds > 500)
+            {
+                _logger.Log(LogLevel.Debug, $"Socket {SocketId}{(subscription == null ? "" : " subscription " + subscription!.Id)} message processing slow ({(int)total.TotalMilliseconds}ms, {(int)userProcessTime.TotalMilliseconds}ms user code), consider offloading data handling to another thread. " +
+                                                "Data from this socket may arrive late or not at all if message processing is continuously slow.");
+            }
+
+            _logger.Log(LogLevel.Trace, $"Socket {SocketId}{(subscription == null ? "" : " subscription " + subscription!.Id)} message processed in {(int)total.TotalMilliseconds}ms, ({(int)userProcessTime.TotalMilliseconds}ms user code)");
+        }
+
+        /// <summary>
+        /// Connect the websocket
+        /// </summary>
+        /// <returns></returns>
+        public async Task<bool> ConnectAsync() => await _socket.ConnectAsync().ConfigureAwait(false);
+
        /// <summary>
        /// Retrieve the underlying socket
        /// </summary>
        /// <returns></returns>
-        public IWebsocket GetSocket()
-        {
-            return _socket;
-        }
+        public IWebsocket GetSocket() => _socket;

        /// <summary>
        /// Trigger a reconnect of the socket connection
        /// </summary>
        /// <returns></returns>
-        public async Task TriggerReconnectAsync()
-        {
-            await _socket.CloseAsync().ConfigureAwait(false);
-        }
+        public async Task TriggerReconnectAsync() => await _socket.ReconnectAsync().ConfigureAwait(false);

        /// <summary>
        /// Close the connection
@@ -205,23 +390,22 @@ namespace CryptoExchange.Net.Sockets
        /// <returns></returns>
        public async Task CloseAsync()
        {
-            ShouldReconnect = false;
-            if (socketClient.socketConnections.ContainsKey(SocketId))
-                socketClient.socketConnections.TryRemove(SocketId, out _);
+            if (Status == SocketStatus.Closed || Status == SocketStatus.Disposed)
+                return;

-            lock (subscriptionLock)
+            if (ApiClient.socketConnections.ContainsKey(SocketId))
+                ApiClient.socketConnections.TryRemove(SocketId, out _);
+
+            lock (_subscriptionLock)
            {
-                foreach (var subscription in subscriptions)
+                foreach (var subscription in _subscriptions)
                {
                    if (subscription.CancellationTokenRegistration.HasValue)
                        subscription.CancellationTokenRegistration.Value.Dispose();
                }
            }
+
            await _socket.CloseAsync().ConfigureAwait(false);
-
-            if (_socketProcessReconnectTask != null)
-                await _socketProcessReconnectTask.ConfigureAwait(false);
-
            _socket.Dispose();
        }

@@ -232,163 +416,46 @@ namespace CryptoExchange.Net.Sockets
        /// <returns></returns>
        public async Task CloseAsync(SocketSubscription subscription)
        {
-            if (!_socket.IsOpen)
+            lock (_subscriptionLock)
+            {
+                if (!_subscriptions.Contains(subscription))
+                    return;
+
+                subscription.Closed = true;
+            }
+
+            if (Status == SocketStatus.Closing || Status == SocketStatus.Closed || Status == SocketStatus.Disposed)
                return;

+            _logger.Log(LogLevel.Debug, $"Socket {SocketId} closing subscription {subscription.Id}");
            if (subscription.CancellationTokenRegistration.HasValue)
                subscription.CancellationTokenRegistration.Value.Dispose();

-            if (subscription.Confirmed)
-                await socketClient.UnsubscribeAsync(this, subscription).ConfigureAwait(false);
+            if (subscription.Confirmed && _socket.IsOpen)
+                await ApiClient.UnsubscribeAsync(this, subscription).ConfigureAwait(false);

            bool shouldCloseConnection;
-            lock (subscriptionLock)
-                shouldCloseConnection = !subscriptions.Any(r => r.UserSubscription && subscription != r);
+            lock (_subscriptionLock)
+            {
+                if (Status == SocketStatus.Closing)
+                {
+                    _logger.Log(LogLevel.Debug, $"Socket {SocketId} already closing");
+                    return;
+                }
+
+                shouldCloseConnection = _subscriptions.All(r => !r.UserSubscription || r.Closed);
+                if (shouldCloseConnection)
+                    Status = SocketStatus.Closing;
+            }

            if (shouldCloseConnection)
+            {
+                _logger.Log(LogLevel.Debug, $"Socket {SocketId} closing as there are no more subscriptions");
                await CloseAsync().ConfigureAwait(false);
-
-            lock (subscriptionLock)
-                subscriptions.Remove(subscription);
-        }
-
-        private void StartProcessingTask()
-        {
-            log.Write(LogLevel.Trace, $"Starting {SocketId} process/reconnect task");
-            _socketProcessReconnectTask = Task.Run(async () =>
-            {
-                await _socket.ProcessAsync().ConfigureAwait(false);
-                await ReconnectAsync().ConfigureAwait(false);
-                log.Write(LogLevel.Trace, $"Process/reconnect {SocketId} task finished");
-            });
-        }
-
-        private async Task ReconnectAsync()
-        {
-            // Fail all pending requests
-            lock (pendingRequests)
-            {
-                foreach (var pendingRequest in pendingRequests.ToList())
-                {
-                    pendingRequest.Fail();
-                    pendingRequests.Remove(pendingRequest);
-                }
            }

-            if (socketClient.ClientOptions.AutoReconnect && ShouldReconnect)
-            {
-                // Should reconnect
-                DisconnectTime = DateTime.UtcNow;
-                log.Write(LogLevel.Warning, $"Socket {SocketId} Connection lost, will try to reconnect");
-                if (!lostTriggered)
-                {
-                    lostTriggered = true;
-                    ConnectionLost?.Invoke();
-                }
-
-                while (ShouldReconnect)
-                {
-                    if (ReconnectTry > 0)
-                    {
-                        // Wait a bit before attempting reconnect
-                        await Task.Delay(socketClient.ClientOptions.ReconnectInterval).ConfigureAwait(false);
-                    }
-
-                    if (!ShouldReconnect)
-                    {
-                        // Should reconnect changed to false while waiting to reconnect
-                        return;
-                    }
-
-                    _socket.Reset();
-                    if (!await _socket.ConnectAsync().ConfigureAwait(false))
-                    {
-                        // Reconnect failed
-                        ReconnectTry++;
-                        ResubscribeTry = 0;
-                        if (socketClient.ClientOptions.MaxReconnectTries != null
-                        && ReconnectTry >= socketClient.ClientOptions.MaxReconnectTries)
-                        {
-                            log.Write(LogLevel.Warning, $"Socket {SocketId} failed to reconnect after {ReconnectTry} tries, closing");
-                            ShouldReconnect = false;
-
-                            if (socketClient.socketConnections.ContainsKey(SocketId))
-                                socketClient.socketConnections.TryRemove(SocketId, out _);
-
-                            _ = Task.Run(() => ConnectionClosed?.Invoke());
-                            // Reached max tries, break loop and leave connection closed
-                            break;
-                        }
-
-                        // Continue to try again
-                        log.Write(LogLevel.Debug, $"Socket {SocketId} failed to reconnect{(socketClient.ClientOptions.MaxReconnectTries != null ? $", try {ReconnectTry}/{socketClient.ClientOptions.MaxReconnectTries}" : "")}, will try again in {socketClient.ClientOptions.ReconnectInterval}");
-                        continue;
-                    }
-
-                    // Successfully reconnected, start processing
-                    StartProcessingTask();
-
-                    ReconnectTry = 0;
-                    var time = DisconnectTime;
-                    DisconnectTime = null;
-
-                    log.Write(LogLevel.Information, $"Socket {SocketId} reconnected after {DateTime.UtcNow - time}");
-
-                    var reconnectResult = await ProcessReconnectAsync().ConfigureAwait(false);
-                    if (!reconnectResult)
-                    {
-                        // Failed to resubscribe everything
-                        ResubscribeTry++;
-                        DisconnectTime = time;
-
-                        if (socketClient.ClientOptions.MaxResubscribeTries != null &&
-                        ResubscribeTry >= socketClient.ClientOptions.MaxResubscribeTries)
-                        {
-                            log.Write(LogLevel.Warning, $"Socket {SocketId} failed to resubscribe after {ResubscribeTry} tries, closing. Last resubscription error: {reconnectResult.Error}");
-                            ShouldReconnect = false;
-
-                            if (socketClient.socketConnections.ContainsKey(SocketId))
-                                socketClient.socketConnections.TryRemove(SocketId, out _);
-
-                            _ = Task.Run(() => ConnectionClosed?.Invoke());
-                        }
-                        else
-                            log.Write(LogLevel.Debug, $"Socket {SocketId} resubscribing all subscriptions failed on reconnected socket{(socketClient.ClientOptions.MaxResubscribeTries != null ? $", try {ResubscribeTry}/{socketClient.ClientOptions.MaxResubscribeTries}" : "")}. Error: {reconnectResult.Error}. Disconnecting and reconnecting.");
-
-                        // Failed resubscribe, close socket if it is still open
-                        if (_socket.IsOpen)
-                            await _socket.CloseAsync().ConfigureAwait(false);
-                        else
-                            DisconnectTime = DateTime.UtcNow;
-
-                        // Break out of the loop, the new processing task should reconnect again
-                        break;
-                    }
-                    else
-                    {
-                        // Succesfully reconnected
-                        log.Write(LogLevel.Information, $"Socket {SocketId} data connection restored.");
-                        ResubscribeTry = 0;
-                        if (lostTriggered)
-                        {
-                            lostTriggered = false;
-                            _ = Task.Run(() => ConnectionRestored?.Invoke(time.HasValue ? DateTime.UtcNow - time.Value : TimeSpan.FromSeconds(0))).ConfigureAwait(false);
-                        }
-
-                        break;
-                    }
-                }
-            }
-            else
-            {
-                if (!socketClient.ClientOptions.AutoReconnect && ShouldReconnect)
-                    _ = Task.Run(() => ConnectionClosed?.Invoke());
-
-                // No reconnecting needed
-                log.Write(LogLevel.Information, $"Socket {SocketId} closed");
-                if (socketClient.socketConnections.ContainsKey(SocketId))
-                    socketClient.socketConnections.TryRemove(SocketId, out _);
-            }
+            lock (_subscriptionLock)
+                _subscriptions.Remove(subscription);
        }

        /// <summary>
@@ -396,82 +463,26 @@ namespace CryptoExchange.Net.Sockets
        /// </summary>
        public void Dispose()
        {
+            Status = SocketStatus.Disposed;
            _socket.Dispose();
        }

-        /// <summary>
-        /// Process a message received by the socket
-        /// </summary>
-        /// <param name="data">The received data</param>
-        private void ProcessMessage(string data)
-        {
-            var timestamp = DateTime.UtcNow;
-            log.Write(LogLevel.Trace, $"Socket {SocketId} received data: " + data);
-            if (string.IsNullOrEmpty(data)) return;
-
-            var tokenData = data.ToJToken(log);
-            if (tokenData == null)
-            {
-                data = $"\"{data}\"";
-                tokenData = data.ToJToken(log);
-                if (tokenData == null)
-                    return;
-            }
-
-            var handledResponse = false;
-            PendingRequest[] requests;
-            lock(pendingRequests)			
-                requests = pendingRequests.ToArray();
-
-            // Remove any timed out requests
-            foreach (var request in requests.Where(r => r.Completed))
-            {
-                lock (pendingRequests)
-                    pendingRequests.Remove(request);
-            }
-
-            // Check if this message is an answer on any pending requests
-            foreach (var pendingRequest in requests)
-            {
-                if (pendingRequest.CheckData(tokenData))
-                {
-                    lock (pendingRequests)                    
-                        pendingRequests.Remove(pendingRequest);
-
-                    if (!socketClient.ContinueOnQueryResponse)
-                        return;
-
-                    handledResponse = true;
-                    break;
-                }
-            }
-
-            // Message was not a request response, check data handlers
-            var messageEvent = new MessageEvent(this, tokenData, socketClient.ClientOptions.OutputOriginalData ? data: null, timestamp);
-            var (handled, userProcessTime) = HandleData(messageEvent);
-            if (!handled && !handledResponse)
-            {
-                if (!socketClient.UnhandledMessageExpected)
-                    log.Write(LogLevel.Warning, $"Socket {SocketId} Message not handled: " + tokenData);
-                UnhandledMessage?.Invoke(tokenData);
-            }
-
-            var total = DateTime.UtcNow - timestamp;
-            if (userProcessTime.TotalMilliseconds > 500)
-                log.Write(LogLevel.Debug, $"Socket {SocketId} message processing slow ({(int)total.TotalMilliseconds}ms), consider offloading data handling to another thread. " +
-                                                "Data from this socket may arrive late or not at all if message processing is continuously slow.");
-            
-            log.Write(LogLevel.Trace, $"Socket {SocketId} message processed in {(int)total.TotalMilliseconds}ms, ({(int)userProcessTime.TotalMilliseconds}ms user code)");
-        }
-
        /// <summary>
        /// Add a subscription to this connection
        /// </summary>
        /// <param name="subscription"></param>
-        public void AddSubscription(SocketSubscription subscription)
+        public bool AddSubscription(SocketSubscription subscription)
        {
-            lock(subscriptionLock)
-                subscriptions.Add(subscription);
+            lock (_subscriptionLock)
+            {
+                if (Status != SocketStatus.None && Status != SocketStatus.Connected)
+                    return false;
+
+                _subscriptions.Add(subscription);
+                if(subscription.UserSubscription)
+                    _logger.Log(LogLevel.Debug, $"Socket {SocketId} adding new subscription with id {subscription.Id}, total subscriptions on connection: {_subscriptions.Count(s => s.UserSubscription)}");
+                return true;
+            }
        }

        /// <summary>
@@ -480,8 +491,8 @@ namespace CryptoExchange.Net.Sockets
        /// <param name="id"></param>
        public SocketSubscription? GetSubscription(int id)
        {
-            lock (subscriptionLock)
-                return subscriptions.SingleOrDefault(s => s.Id == id);
+            lock (_subscriptionLock)
+                return _subscriptions.SingleOrDefault(s => s.Id == id);
        }

        /// <summary>
@@ -491,8 +502,8 @@ namespace CryptoExchange.Net.Sockets
        /// <returns></returns>
        public SocketSubscription? GetSubscriptionByRequest(Func<object?, bool> predicate)
        {
-            lock(subscriptionLock)
-                return subscriptions.SingleOrDefault(s => predicate(s.Request));
+            lock(_subscriptionLock)
+                return _subscriptions.SingleOrDefault(s => predicate(s.Request));
        }

        /// <summary>
@@ -500,7 +511,7 @@ namespace CryptoExchange.Net.Sockets
        /// </summary>
        /// <param name="messageEvent"></param>
        /// <returns>True if the data was successfully handled</returns>
-        private (bool, TimeSpan) HandleData(MessageEvent messageEvent)
+        private (bool, TimeSpan, SocketSubscription?) HandleData(MessageEvent messageEvent)
        {
            SocketSubscription? currentSubscription = null;
            try
@@ -510,15 +521,15 @@ namespace CryptoExchange.Net.Sockets

                // Loop the subscriptions to check if any of them signal us that the message is for them
                List<SocketSubscription> subscriptionsCopy;
-                lock (subscriptionLock)
-                    subscriptionsCopy = subscriptions.ToList();
+                lock (_subscriptionLock)
+                    subscriptionsCopy = _subscriptions.ToList();

                foreach (var subscription in subscriptionsCopy)
                {
                    currentSubscription = subscription;
                    if (subscription.Request == null)
                    {
-                        if (socketClient.MessageMatchesHandler(this, messageEvent.JsonData, subscription.Identifier!))
+                        if (ApiClient.MessageMatchesHandler(this, messageEvent.JsonData, subscription.Identifier!))
                        {
                            handled = true;
                            var userSw = Stopwatch.StartNew();
@@ -529,10 +540,10 @@ namespace CryptoExchange.Net.Sockets
                    }
                    else
                    {
-                        if (socketClient.MessageMatchesHandler(this, messageEvent.JsonData, subscription.Request))
+                        if (ApiClient.MessageMatchesHandler(this, messageEvent.JsonData, subscription.Request))
                        {
                            handled = true;
-                            messageEvent.JsonData = socketClient.ProcessTokenData(messageEvent.JsonData);
+                            messageEvent.JsonData = ApiClient.ProcessTokenData(messageEvent.JsonData);
                            var userSw = Stopwatch.StartNew();
                            subscription.MessageHandler(messageEvent);
                            userSw.Stop();
@@ -541,13 +552,13 @@ namespace CryptoExchange.Net.Sockets
                    }
                }
                               
-                return (handled, userCodeDuration);
+                return (handled, userCodeDuration, currentSubscription);
            }
            catch (Exception ex)
            {
-                log.Write(LogLevel.Error, $"Socket {SocketId} Exception during message processing\r\nException: {ex.ToLogString()}\r\nData: {messageEvent.JsonData}");
+                _logger.Log(LogLevel.Error, $"Socket {SocketId} Exception during message processing\r\nException: {ex.ToLogString()}\r\nData: {messageEvent.JsonData}");
                currentSubscription?.InvokeExceptionHandler(ex);
-                return (false, TimeSpan.Zero);
+                return (false, TimeSpan.Zero, null);
            }
        }

@@ -557,14 +568,15 @@ namespace CryptoExchange.Net.Sockets
        /// <typeparam name="T">The data type expected in response</typeparam>
        /// <param name="obj">The object to send</param>
        /// <param name="timeout">The timeout for response</param>
+        /// <param name="subscription">Subscription if this is a subscribe request</param>
        /// <param name="handler">The response handler, should return true if the received JToken was the response to the request</param>
        /// <returns></returns>
-        public virtual Task SendAndWaitAsync<T>(T obj, TimeSpan timeout, Func<JToken, bool> handler)
+        public virtual Task SendAndWaitAsync<T>(T obj, TimeSpan timeout, SocketSubscription? subscription, Func<JToken, bool> handler)
        {
-            var pending = new PendingRequest(handler, timeout);
-            lock (pendingRequests)
+            var pending = new PendingRequest(handler, timeout, subscription);
+            lock (_pendingRequests)
            {
-                pendingRequests.Add(pending);
+                _pendingRequests.Add(pending);
            }
            var sendOk = Send(obj);
            if(!sendOk)            
@@ -593,7 +605,7 @@ namespace CryptoExchange.Net.Sockets
        /// <param name="data">The data to send</param>
        public virtual bool Send(string data)
        {
-            log.Write(LogLevel.Trace, $"Socket {SocketId} sending data: {data}");
+            _logger.Log(LogLevel.Trace, $"Socket {SocketId} sending data: {data}");
            try
            {
                _socket.Send(data);
@@ -605,63 +617,92 @@ namespace CryptoExchange.Net.Sockets
            }
        }

-        /// <summary>
-        /// Handler for a socket opening
-        /// </summary>
-        protected virtual void SocketOnOpen()
-        {
-            ReconnectTry = 0;
-            PausedActivity = false;
-        }
-
        private async Task<CallResult<bool>> ProcessReconnectAsync()
        {
            if (!_socket.IsOpen)
                return new CallResult<bool>(new WebError("Socket not connected"));

-            if (Authenticated)
+            bool anySubscriptions = false;
+            lock (_subscriptionLock)
+                anySubscriptions = _subscriptions.Any(s => s.UserSubscription);
+
+            if (!anySubscriptions)
+            {
+                // No need to resubscribe anything
+                _logger.Log(LogLevel.Debug, $"Socket {SocketId} Nothing to resubscribe, closing connection");
+                _ = _socket.CloseAsync();
+                return new CallResult<bool>(true);
+            }
+
+            bool anyAuthenticated = false;
+            lock (_subscriptionLock)
+                anyAuthenticated = _subscriptions.Any(s => s.Authenticated);
+
+            if (anyAuthenticated)
            {
                // If we reconnected a authenticated connection we need to re-authenticate
-                var authResult = await socketClient.AuthenticateSocketAsync(this).ConfigureAwait(false);
+                var authResult = await ApiClient.AuthenticateSocketAsync(this).ConfigureAwait(false);
                if (!authResult)
                {
-                    log.Write(LogLevel.Warning, $"Socket {SocketId} authentication failed on reconnected socket. Disconnecting and reconnecting.");
+                    _logger.Log(LogLevel.Warning, $"Socket {SocketId} authentication failed on reconnected socket. Disconnecting and reconnecting.");
                    return authResult;
                }

-                log.Write(LogLevel.Debug, $"Socket {SocketId} authentication succeeded on reconnected socket.");
+                Authenticated = true;
+                _logger.Log(LogLevel.Debug, $"Socket {SocketId} authentication succeeded on reconnected socket.");
            }

            // Get a list of all subscriptions on the socket
-            List<SocketSubscription> subscriptionList;
-            lock (subscriptionLock)
-                subscriptionList = subscriptions.Where(h => h.Request != null).ToList();
+            List<SocketSubscription> subscriptionList = new List<SocketSubscription>();
+            lock (_subscriptionLock)
+            {
+                foreach (var subscription in _subscriptions)
+                {
+                    if (subscription.Request != null)
+                        subscriptionList.Add(subscription);
+                    else
+                        subscription.Confirmed = true;
+                }
+            }
+
+            foreach(var subscription in subscriptionList.Where(s => s.Request != null))
+            {
+                var result = await ApiClient.RevitalizeRequestAsync(subscription.Request!).ConfigureAwait(false);
+                if (!result)
+                {
+                    _logger.Log(LogLevel.Warning, "Failed request revitalization: " + result.Error);
+                    return result.As<bool>(false);
+                }
+            }

            // Foreach subscription which is subscribed by a subscription request we will need to resend that request to resubscribe
-            for (var i = 0; i < subscriptionList.Count; i += socketClient.ClientOptions.MaxConcurrentResubscriptionsPerSocket)
+            for (var i = 0; i < subscriptionList.Count; i += ApiClient.ClientOptions.MaxConcurrentResubscriptionsPerSocket)
            {
                if (!_socket.IsOpen)
                    return new CallResult<bool>(new WebError("Socket not connected"));

                var taskList = new List<Task<CallResult<bool>>>();
-                foreach (var subscription in subscriptionList.Skip(i).Take(socketClient.ClientOptions.MaxConcurrentResubscriptionsPerSocket))
-                    taskList.Add(socketClient.SubscribeAndWaitAsync(this, subscription.Request!, subscription));                
+                foreach (var subscription in subscriptionList.Skip(i).Take(ApiClient.ClientOptions.MaxConcurrentResubscriptionsPerSocket))
+                    taskList.Add(ApiClient.SubscribeAndWaitAsync(this, subscription.Request!, subscription));

                await Task.WhenAll(taskList).ConfigureAwait(false);
                if (taskList.Any(t => !t.Result.Success))
                    return taskList.First(t => !t.Result.Success).Result;
            }

+            foreach (var subscription in subscriptionList)
+                subscription.Confirmed = true;
+
            if (!_socket.IsOpen)
                return new CallResult<bool>(new WebError("Socket not connected"));

-            log.Write(LogLevel.Debug, $"Socket {SocketId} all subscription successfully resubscribed on reconnected socket.");
+            _logger.Log(LogLevel.Debug, $"Socket {SocketId} all subscription successfully resubscribed on reconnected socket.");
            return new CallResult<bool>(true);
        }

        internal async Task UnsubscribeAsync(SocketSubscription socketSubscription)
        {
-            await socketClient.UnsubscribeAsync(this, socketSubscription).ConfigureAwait(false);
+            await ApiClient.UnsubscribeAsync(this, socketSubscription).ConfigureAwait(false);
        }

        internal async Task<CallResult<bool>> ResubscribeAsync(SocketSubscription socketSubscription)
@@ -669,7 +710,42 @@ namespace CryptoExchange.Net.Sockets
            if (!_socket.IsOpen)
                return new CallResult<bool>(new UnknownError("Socket is not connected"));

-            return await socketClient.SubscribeAndWaitAsync(this, socketSubscription.Request!, socketSubscription).ConfigureAwait(false);
+            return await ApiClient.SubscribeAndWaitAsync(this, socketSubscription.Request!, socketSubscription).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Status of the socket connection
+        /// </summary>
+        public enum SocketStatus
+        {
+            /// <summary>
+            /// None/Initial
+            /// </summary>
+            None,
+            /// <summary>
+            /// Connected
+            /// </summary>
+            Connected,
+            /// <summary>
+            /// Reconnecting
+            /// </summary>
+            Reconnecting,
+            /// <summary>
+            /// Resubscribing on reconnected socket
+            /// </summary>
+            Resubscribing,
+            /// <summary>
+            /// Closing
+            /// </summary>
+            Closing,
+            /// <summary>
+            /// Closed
+            /// </summary>
+            Closed,
+            /// <summary>
+            /// Disposed
+            /// </summary>
+            Disposed
        }
    }
 }
@@ -43,19 +43,30 @@ namespace CryptoExchange.Net.Sockets
        /// </summary>
        public bool Confirmed { get; set; }

+        /// <summary>
+        /// Whether authentication is needed for this subscription
+        /// </summary>
+        public bool Authenticated { get; set; }
+
+        /// <summary>
+        /// Whether we're closing this subscription and a socket connection shouldn't be kept open for it
+        /// </summary>
+        public bool Closed { get; set; }
+
        /// <summary>
        /// Cancellation token registration, should be disposed when subscription is closed. Used for closing the subscription with 
        /// a provided cancelation token
        /// </summary>
        public CancellationTokenRegistration? CancellationTokenRegistration { get; set; }

-        private SocketSubscription(int id, object? request, string? identifier, bool userSubscription, Action<MessageEvent> dataHandler)
+        private SocketSubscription(int id, object? request, string? identifier, bool userSubscription, bool authenticated, Action<MessageEvent> dataHandler)
        {
            Id = id;
            UserSubscription = userSubscription;
            MessageHandler = dataHandler;
            Request = request;
            Identifier = identifier;
+            Authenticated = authenticated;
        }

        /// <summary>
@@ -64,12 +75,13 @@ namespace CryptoExchange.Net.Sockets
        /// <param name="id"></param>
        /// <param name="request"></param>
        /// <param name="userSubscription"></param>
+        /// <param name="authenticated"></param>
        /// <param name="dataHandler"></param>
        /// <returns></returns>
        public static SocketSubscription CreateForRequest(int id, object request, bool userSubscription,
-            Action<MessageEvent> dataHandler)
+            bool authenticated, Action<MessageEvent> dataHandler)
        {
-            return new SocketSubscription(id, request, null, userSubscription, dataHandler);
+            return new SocketSubscription(id, request, null, userSubscription, authenticated, dataHandler);
        }

        /// <summary>
@@ -78,12 +90,13 @@ namespace CryptoExchange.Net.Sockets
        /// <param name="id"></param>
        /// <param name="identifier"></param>
        /// <param name="userSubscription"></param>
+        /// <param name="authenticated"></param>
        /// <param name="dataHandler"></param>
        /// <returns></returns>
        public static SocketSubscription CreateForIdentifier(int id, string identifier, bool userSubscription,
-            Action<MessageEvent> dataHandler)
+            bool authenticated, Action<MessageEvent> dataHandler)
        {
-            return new SocketSubscription(id, null, identifier, userSubscription, dataHandler);
+            return new SocketSubscription(id, null, identifier, userSubscription, authenticated, dataHandler);
        }

        /// <summary>
@@ -9,26 +9,25 @@ namespace CryptoExchange.Net.Sockets
    /// </summary>
    public class UpdateSubscription
    {
-        private readonly SocketConnection connection;
-        private readonly SocketSubscription subscription;
+        private readonly SocketConnection _connection;
+        private readonly SocketSubscription _subscription;

        /// <summary>
        /// Event when the connection is lost. The socket will automatically reconnect when possible.
        /// </summary>
        public event Action ConnectionLost
        {
-            add => connection.ConnectionLost += value;
-            remove => connection.ConnectionLost -= value;
+            add => _connection.ConnectionLost += value;
+            remove => _connection.ConnectionLost -= value;
        }

        /// <summary>
-        /// Event when the connection is closed. This event happens when reconnecting/resubscribing has failed too often based on the <see cref="BaseSocketClientOptions.MaxReconnectTries"/> and <see cref="BaseSocketClientOptions.MaxResubscribeTries"/> options,
-        /// or <see cref="BaseSocketClientOptions.AutoReconnect"/> is false. The socket will not be reconnected
+        /// Event when the connection is closed and will not be reconnected
        /// </summary>
        public event Action ConnectionClosed
        {
-            add => connection.ConnectionClosed += value;
-            remove => connection.ConnectionClosed -= value;
+            add => _connection.ConnectionClosed += value;
+            remove => _connection.ConnectionClosed -= value;
        }

        /// <summary>
@@ -38,8 +37,8 @@ namespace CryptoExchange.Net.Sockets
        /// </summary>
        public event Action<TimeSpan> ConnectionRestored
        {
-            add => connection.ConnectionRestored += value;
-            remove => connection.ConnectionRestored -= value;
+            add => _connection.ConnectionRestored += value;
+            remove => _connection.ConnectionRestored -= value;
        }

        /// <summary>
@@ -47,8 +46,8 @@ namespace CryptoExchange.Net.Sockets
        /// </summary>
        public event Action ActivityPaused
        {
-            add => connection.ActivityPaused += value;
-            remove => connection.ActivityPaused -= value;
+            add => _connection.ActivityPaused += value;
+            remove => _connection.ActivityPaused -= value;
        }

        /// <summary>
@@ -56,8 +55,8 @@ namespace CryptoExchange.Net.Sockets
        /// </summary>
        public event Action ActivityUnpaused
        {
-            add => connection.ActivityUnpaused += value;
-            remove => connection.ActivityUnpaused -= value;
+            add => _connection.ActivityUnpaused += value;
+            remove => _connection.ActivityUnpaused -= value;
        }

        /// <summary>
@@ -65,19 +64,19 @@ namespace CryptoExchange.Net.Sockets
        /// </summary>
        public event Action<Exception> Exception
        {
-            add => subscription.Exception += value;
-            remove => subscription.Exception -= value;
+            add => _subscription.Exception += value;
+            remove => _subscription.Exception -= value;
        }

        /// <summary>
        /// The id of the socket
        /// </summary>
-        public int SocketId => connection.SocketId;
+        public int SocketId => _connection.SocketId;

        /// <summary>
        /// The id of the subscription
        /// </summary>
-        public int Id => subscription.Id;
+        public int Id => _subscription.Id;

        /// <summary>
        /// ctor
@@ -86,8 +85,8 @@ namespace CryptoExchange.Net.Sockets
        /// <param name="subscription">The subscription</param>
        public UpdateSubscription(SocketConnection connection, SocketSubscription subscription)
        {
-            this.connection = connection;
-            this.subscription = subscription;
+            this._connection = connection;
+            this._subscription = subscription;
        }
        
        /// <summary>
@@ -96,7 +95,7 @@ namespace CryptoExchange.Net.Sockets
        /// <returns></returns>
        public Task CloseAsync()
        {
-            return connection.CloseAsync(subscription);
+            return _connection.CloseAsync(_subscription);
        }

        /// <summary>
@@ -105,7 +104,7 @@ namespace CryptoExchange.Net.Sockets
        /// <returns></returns>
        public Task ReconnectAsync()
        {
-            return connection.TriggerReconnectAsync();
+            return _connection.TriggerReconnectAsync();
        }

        /// <summary>
@@ -114,7 +113,7 @@ namespace CryptoExchange.Net.Sockets
        /// <returns></returns>
        internal async Task UnsubscribeAsync()
        {
-            await connection.UnsubscribeAsync(subscription).ConfigureAwait(false);
+            await _connection.UnsubscribeAsync(_subscription).ConfigureAwait(false);
        }

        /// <summary>
@@ -123,7 +122,7 @@ namespace CryptoExchange.Net.Sockets
        /// <returns></returns>
        internal async Task<CallResult<bool>> ResubscribeAsync()
        {
-            return await connection.ResubscribeAsync(subscription).ConfigureAwait(false);
+            return await _connection.ResubscribeAsync(_subscription).ConfigureAwait(false);
        }
    }
 }
@@ -0,0 +1,90 @@
+using CryptoExchange.Net.Objects;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.Sockets
+{
+    /// <summary>
+    /// Parameters for a websocket
+    /// </summary>
+    public class WebSocketParameters
+    {
+        /// <summary>
+        /// The uri to connect to
+        /// </summary>
+        public Uri Uri { get; set; }
+
+        /// <summary>
+        /// Headers to send in the connection handshake
+        /// </summary>
+        public IDictionary<string, string> Headers { get; set; } = new Dictionary<string, string>();
+
+        /// <summary>
+        /// Cookies to send in the connection handshake
+        /// </summary>
+        public IDictionary<string, string> Cookies { get; set; } = new Dictionary<string, string>();
+
+        /// <summary>
+        /// The time to wait between reconnect attempts
+        /// </summary>
+        public TimeSpan ReconnectInterval { get; set; } = TimeSpan.FromSeconds(5);
+
+        /// <summary>
+        /// Proxy for the connection
+        /// </summary>
+        public ApiProxy? Proxy { get; set; }
+
+        /// <summary>
+        /// Whether the socket should automatically reconnect when connection is lost
+        /// </summary>
+        public bool AutoReconnect { get; set; }
+
+        /// <summary>
+        /// The maximum time of no data received before considering the connection lost and closting/reconnecting the socket
+        /// </summary>
+        public TimeSpan? Timeout { get; set; }
+
+        /// <summary>
+        /// Interval at which to send ping frames
+        /// </summary>
+        public TimeSpan? KeepAliveInterval { get; set; }
+
+        /// <summary>
+        /// The max amount of messages to send per second
+        /// </summary>
+        public int? RatelimitPerSecond { get; set; }
+
+        /// <summary>
+        /// Origin header value to send in the connection handshake
+        /// </summary>
+        public string? Origin { get; set; }
+
+        /// <summary>
+        /// Delegate used for processing byte data received from socket connections before it is processed by handlers
+        /// </summary>
+        public Func<byte[], string>? DataInterpreterBytes { get; set; }
+
+        /// <summary>
+        /// Delegate used for processing string data received from socket connections before it is processed by handlers
+        /// </summary>
+        public Func<string, string>? DataInterpreterString { get; set; }
+
+        /// <summary>
+        /// Encoding for sending/receiving data
+        /// </summary>
+        public Encoding Encoding { get; set; } = Encoding.UTF8;
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="uri">Uri</param>
+        /// <param name="autoReconnect">Auto reconnect</param>
+        public WebSocketParameters(Uri uri, bool autoReconnect)
+        {
+            Uri = uri;
+            AutoReconnect = autoReconnect;
+        }
+    }
+}
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
-using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Logging;
+using CryptoExchange.Net.Interfaces;
+using Microsoft.Extensions.Logging;

 namespace CryptoExchange.Net.Sockets
 {
@@ -11,15 +9,9 @@ namespace CryptoExchange.Net.Sockets
    public class WebsocketFactory : IWebsocketFactory
    {
        /// <inheritdoc />
-        public IWebsocket CreateWebsocket(Log log, string url)
+        public IWebsocket CreateWebsocket(ILogger logger, WebSocketParameters parameters)
        {
-            return new CryptoExchangeWebSocketClient(log, new Uri(url));
-        }
-
-        /// <inheritdoc />
-        public IWebsocket CreateWebsocket(Log log, string url, IDictionary<string, string> cookies, IDictionary<string, string> headers)
-        {
-            return new CryptoExchangeWebSocketClient(log, new Uri(url), cookies, headers);
+            return new CryptoExchangeWebSocketClient(logger, parameters);
        }
    }
 }
@@ -5,20 +5,15 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Binance.Net" Version="8.0.6" />
-    <PackageReference Include="Bitfinex.Net" Version="5.0.3" />
-    <PackageReference Include="Bittrex.Net" Version="7.0.4" />
-    <PackageReference Include="Bybit.Net" Version="0.0.4" />
-    <PackageReference Include="CoinEx.Net" Version="5.0.3" />
-    <PackageReference Include="FTX.Net" Version="1.0.4" />
-    <PackageReference Include="Huobi.Net" Version="4.0.4" />
-    <PackageReference Include="KrakenExchange.Net" Version="3.0.3" />
-    <PackageReference Include="Kucoin.Net" Version="4.0.3" />
-    <PackageReference Include="Serilog.AspNetCore" Version="4.1.1-dev-00250" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Data\" />
+    <PackageReference Include="Binance.Net" Version="9.0.1" />
+    <PackageReference Include="Bitfinex.Net" Version="6.0.0" />
+    <PackageReference Include="Bittrex.Net" Version="8.0.0" />
+    <PackageReference Include="Bybit.Net" Version="3.0.0" />
+    <PackageReference Include="CoinEx.Net" Version="6.0.0" />
+    <PackageReference Include="Huobi.Net" Version="5.0.0" />
+    <PackageReference Include="KrakenExchange.Net" Version="4.0.0" />
+    <PackageReference Include="Kucoin.Net" Version="5.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="6.0.0" />
  </ItemGroup>

 </Project>
@@ -1,13 +1,12 @@
@page "/"
-@inject IBinanceClient binanceClient
-@inject IBitfinexClient bitfinexClient
-@inject IBittrexClient bittrexClient
-@inject IBybitClient bybitClient
-@inject ICoinExClient coinexClient
-@inject IFTXClient ftxClient
-@inject IHuobiClient huobiClient
-@inject IKrakenClient krakenClient
-@inject IKucoinClient kucoinClient
+@inject IBinanceRestClient binanceClient
+@inject IBitfinexRestClient bitfinexClient
+@inject IBittrexRestClient bittrexClient
+@inject IBybitRestClient bybitClient
+@inject ICoinExRestClient coinexClient
+@inject IHuobiRestClient huobiClient
+@inject IKrakenRestClient krakenClient
+@inject IKucoinRestClient kucoinClient

 <h3>BTC-USD prices:</h3>
@foreach(var price in _prices.OrderBy(p => p.Key))
@@ -23,14 +22,13 @@
        var binanceTask = binanceClient.SpotApi.ExchangeData.GetTickerAsync("BTCUSDT");
        var bitfinexTask = bitfinexClient.SpotApi.ExchangeData.GetTickerAsync("tBTCUSD");
        var bittrexTask = bittrexClient.SpotApi.ExchangeData.GetTickerAsync("BTC-USDT");
-        var bybitTask = bybitClient.SpotApi.ExchangeData.GetTickerAsync("BTCUSDT");
+        var bybitTask = bybitClient.V5Api.ExchangeData.GetSpotTickersAsync("BTCUSDT");
        var coinexTask = coinexClient.SpotApi.ExchangeData.GetTickerAsync("BTCUSDT");
-        var ftxTask = ftxClient.TradeApi.ExchangeData.GetSymbolAsync("BTC/USD");
        var huobiTask = huobiClient.SpotApi.ExchangeData.GetTickerAsync("btcusdt");
        var krakenTask = krakenClient.SpotApi.ExchangeData.GetTickerAsync("XBTUSD");
        var kucoinTask =  kucoinClient.SpotApi.ExchangeData.GetTickerAsync("BTC-USDT");

-        await Task.WhenAll(binanceTask, bitfinexTask, bittrexTask, bybitTask, coinexTask, ftxTask, huobiTask, krakenTask, kucoinTask);
+        await Task.WhenAll(binanceTask, bitfinexTask, bittrexTask, bybitTask, coinexTask, huobiTask, krakenTask, kucoinTask);

        if (binanceTask.Result.Success)
            _prices.Add("Binance", binanceTask.Result.Data.LastPrice);
@@ -42,14 +40,11 @@
            _prices.Add("Bittrex", bittrexTask.Result.Data.LastPrice);

        if (bybitTask.Result.Success)
-            _prices.Add("Bybit", bybitTask.Result.Data.LastPrice);
+            _prices.Add("Bybit", bybitTask.Result.Data.List.First().LastPrice);

        if (coinexTask.Result.Success)
            _prices.Add("CoinEx", coinexTask.Result.Data.Ticker.LastPrice);

-        if (ftxTask.Result.Success)
-            _prices.Add("FTX", ftxTask.Result.Data.LastPrice ?? 0);
-
        if (huobiTask.Result.Success)
            _prices.Add("Huobi", huobiTask.Result.Data.ClosePrice ?? 0);

@@ -4,21 +4,12 @@
@inject IBittrexSocketClient bittrexSocketClient
@inject IBybitSocketClient bybitSocketClient
@inject ICoinExSocketClient coinExSocketClient
-@inject IFTXSocketClient ftxSocketClient
@inject IHuobiSocketClient huobiSocketClient
@inject IKrakenSocketClient krakenSocketClient
@inject IKucoinSocketClient kucoinSocketClient
-@using Binance.Net.Clients.SpotApi
-@using Bitfinex.Net.Clients.SpotApi
-@using Bittrex.Net.Clients.SpotApi
-@using Bybit.Net.Clients.SpotApi
-@using CoinEx.Net.Clients.SpotApi
+@using System.Collections.Concurrent
@using CryptoExchange.Net.Objects
@using CryptoExchange.Net.Sockets
-@using Huobi.Net.Clients.SpotApi
-@using Kraken.Net.Clients.SpotApi
-@using Kucoin.Net.Clients.SpotApi
-@using System.Collections.Concurrent
@implements IDisposable

 <h3>ETH-BTC prices, live updates:</h3>
@@ -35,15 +26,14 @@
    {
        var tasks = new Task<CallResult<UpdateSubscription>>[]
        {
-            binanceSocketClient.SpotStreams.SubscribeToTickerUpdatesAsync("ETHBTC", data => UpdateData("Binance", data.Data.LastPrice)),
-            bitfinexSocketClient.SpotStreams.SubscribeToTickerUpdatesAsync("tETHBTC", data => UpdateData("Bitfinex", data.Data.LastPrice)),
-            bittrexSocketClient.SpotStreams.SubscribeToTickerUpdatesAsync("ETH-BTC", data => UpdateData("Bittrex", data.Data.LastPrice)),
-            bybitSocketClient.SpotStreams.SubscribeToTickerUpdatesAsync("ETHBTC", data => UpdateData("Bybit", data.Data.LastPrice)),
-            coinExSocketClient.SpotStreams.SubscribeToTickerUpdatesAsync("ETHBTC", data => UpdateData("CoinEx", data.Data.LastPrice)),
-            ftxSocketClient.Streams.SubscribeToTickerUpdatesAsync("ETH/BTC", data => UpdateData("FTX", data.Data.LastPrice ?? 0)),
-            huobiSocketClient.SpotStreams.SubscribeToTickerUpdatesAsync("ethbtc", data => UpdateData("Huobi", data.Data.ClosePrice ?? 0)),
-            krakenSocketClient.SpotStreams.SubscribeToTickerUpdatesAsync("ETH/XBT", data => UpdateData("Kraken", data.Data.LastTrade.Price)),
-            kucoinSocketClient.SpotStreams.SubscribeToTickerUpdatesAsync("ETH-BTC", data => UpdateData("Kucoin", data.Data.LastPrice ?? 0)),
+            binanceSocketClient.SpotApi.ExchangeData.SubscribeToTickerUpdatesAsync("ETHBTC", data => UpdateData("Binance", data.Data.LastPrice)),
+            bitfinexSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("tETHBTC", data => UpdateData("Bitfinex", data.Data.LastPrice)),
+            bittrexSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETH-BTC", data => UpdateData("Bittrex", data.Data.LastPrice)),
+            bybitSocketClient.V5SpotApi.SubscribeToTickerUpdatesAsync("ETHBTC", data => UpdateData("Bybit", data.Data.LastPrice)),
+            coinExSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETHBTC", data => UpdateData("CoinEx", data.Data.LastPrice)),
+            huobiSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ethbtc", data => UpdateData("Huobi", data.Data.ClosePrice ?? 0)),
+            krakenSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETH/XBT", data => UpdateData("Kraken", data.Data.LastTrade.Price)),
+            kucoinSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETH-BTC", data => UpdateData("Kucoin", data.Data.LastPrice ?? 0)),
        };

        await Task.WhenAll(tasks);
@@ -1,19 +1,24 @@
@page "/OrderBooks"
-@using Binance.Net.SymbolOrderBooks
-@using Bitfinex.Net.SymbolOrderBooks
-@using Bittrex.Net.SymbolOrderBooks
-@using Bybit.Net.SymbolOrderBooks
-@using CryptoExchange.Net.Interfaces
-@using CryptoExchange.Net.Objects
-@using CryptoExchange.Net.Sockets
-@using CoinEx.Net.SymbolOrderBooks
-@using FTX.Net.SymbolOrderBooks
-@using Huobi.Net.SymbolOrderBooks
-@using Kraken.Net.SymbolOrderBooks
-@using Kucoin.Net.Clients
-@using Kucoin.Net.SymbolOrderBooks
@using System.Collections.Concurrent
@using System.Timers
+@using Binance.Net.Interfaces
+@using Bitfinex.Net.Interfaces
+@using Bittrex.Net.Interfaces
+@using Bybit.Net.Interfaces
+@using CoinEx.Net.Interfaces
+@using CryptoExchange.Net.Interfaces
+@using Huobi.Net.Interfaces
+@using Kraken.Net.Interfaces
+@using Kucoin.Net.Clients
+@using Kucoin.Net.Interfaces
+@inject IBinanceOrderBookFactory binanceFactory
+@inject IBitfinexOrderBookFactory bitfinexFactory
+@inject IBittrexOrderBookFactory bittrexFactory
+@inject IBybitOrderBookFactory bybitFactory
+@inject ICoinExOrderBookFactory coinExFactory
+@inject IHuobiOrderBookFactory huobiFactory
+@inject IKrakenOrderBookFactory krakenFactory
+@inject IKucoinOrderBookFactory kucoinFactory
@implements IDisposable

 <h3>ETH-BTC books, live updates:</h3>
@@ -40,22 +45,21 @@
    protected override async Task OnInitializedAsync()
    {
        // Since the Kucoin order book stream needs authentication we will need to provide API credentials beforehand
-        KucoinClient.SetDefaultOptions(new Kucoin.Net.Objects.KucoinClientOptions
-            {
-                ApiCredentials = new Kucoin.Net.Objects.KucoinApiCredentials("KEY", "SECRET", "PASSPHRASE")
-            });
+        KucoinRestClient.SetDefaultOptions(options =>
+        {
+            options.ApiCredentials = new Kucoin.Net.Objects.KucoinApiCredentials("KEY", "SECRET", "PASSPHRASE");
+        });

        _books = new Dictionary<string, ISymbolOrderBook>
            {
-                { "Binance", new BinanceSpotSymbolOrderBook("ETHBTC") },
-                { "Bitfinex", new BitfinexSymbolOrderBook("tETHBTC") },
-                { "Bittrex", new BittrexSymbolOrderBook("ETH-BTC") },
-                { "Bybit", new BybitSpotSymbolOrderBook("ETHBTC") },
-                { "CoinEx", new CoinExSpotSymbolOrderBook("ETHBTC") },
-                { "FTX", new FTXSymbolOrderBook("ETH/BTC") },
-                { "Huobi", new HuobiSpotSymbolOrderBook("ethbtc") },
-                { "Kraken", new KrakenSpotSymbolOrderBook("ETH/XBT") },
-                { "Kucoin", new KucoinSpotSymbolOrderBook("ETH-BTC") },
+                { "Binance", binanceFactory.CreateSpot("ETHBTC") },
+                { "Bitfinex", bitfinexFactory.Create("tETHBTC") },
+                { "Bittrex", bittrexFactory.Create("ETH-BTC") },
+                { "Bybit", bybitFactory.Create("ETHBTC", Bybit.Net.Enums.Category.Spot) },
+                { "CoinEx", coinExFactory.CreateSpot("ETHBTC") },
+                { "Huobi", huobiFactory.CreateSpot("ethbtc") },
+                { "Kraken", krakenFactory.CreateSpot("ETH/XBT") },
+                { "Kucoin", kucoinFactory.CreateSpot("ETH-BTC") },
            };

        await Task.WhenAll(_books.Select(b => b.Value.StartAsync()));
@@ -70,7 +74,7 @@
    {
        _timer.Stop();
        _timer.Dispose();
-        foreach (var book in _books)
+        foreach (var book in _books.Where(b => b.Value.Status != CryptoExchange.Net.Objects.OrderBookStatus.Disconnected))
            // It's not necessary to wait for this
            _ = book.Value.StopAsync();
    }
@@ -1,13 +1,12 @@
@page "/SpotClient"
-@inject IBinanceClient binanceClient
-@inject IBitfinexClient bitfinexClient
-@inject IBittrexClient bittrexClient
-@inject IBybitClient bybitClient
-@inject ICoinExClient coinexClient
-@inject IFTXClient ftxClient
-@inject IHuobiClient huobiClient
-@inject IKrakenClient krakenClient
-@inject IKucoinClient kucoinClient
+@inject IBinanceRestClient binanceClient
+@inject IBitfinexRestClient bitfinexClient
+@inject IBittrexRestClient bittrexClient
+@inject IBybitRestClient bybitClient
+@inject ICoinExRestClient coinexClient
+@inject IHuobiRestClient huobiClient
+@inject IKrakenRestClient krakenClient
+@inject IKucoinRestClient kucoinClient
@using Binance.Net.Clients.SpotApi
@using Bitfinex.Net.Clients.SpotApi
@using Bittrex.Net.Clients.SpotApi
@@ -15,7 +14,6 @@
@using CoinEx.Net.Clients.SpotApi
@using CryptoExchange.Net.Interfaces
@using CryptoExchange.Net.Interfaces.CommonClients
-@using FTX.Net.Clients.TradeApi
@using Huobi.Net.Clients.SpotApi
@using Kraken.Net.Clients.SpotApi
@using Kucoin.Net.Clients.SpotApi
@@ -37,9 +35,8 @@
                binanceClient.SpotApi.CommonSpotClient, 
                bitfinexClient.SpotApi.CommonSpotClient,
                bittrexClient.SpotApi.CommonSpotClient, 
-                bybitClient.SpotApi.CommonSpotClient, 
-                coinexClient.SpotApi.CommonSpotClient, 
-                ftxClient.TradeApi.CommonSpotClient, 
+                bybitClient.SpotApiV1.CommonSpotClient, 
+                coinexClient.SpotApi.CommonSpotClient,
                huobiClient.SpotApi.CommonSpotClient, 
                krakenClient.SpotApi.CommonSpotClient, 
                kucoinClient.SpotApi.CommonSpotClient
@@ -2,15 +2,11 @@ using System.Collections.Generic;
 using Binance.Net;
 using Binance.Net.Clients;
 using Binance.Net.Interfaces.Clients;
-using Binance.Net.Objects;
 using Bitfinex.Net;
 using Bittrex.Net;
 using Bybit.Net;
 using CoinEx.Net;
-using CoinEx.Net.Clients;
-using CoinEx.Net.Interfaces.Clients;
 using CryptoExchange.Net.Authentication;
-using FTX.Net;
 using Huobi.Net;
 using Kraken.Net;
 using Kucoin.Net;
@@ -43,35 +39,18 @@ namespace BlazorClient
            services.AddServerSideBlazor();

            // Register the clients, options can be provided in the callback parameter
-            services.AddBinance((restClientOptions, socketClientOptions) => {
-                restClientOptions.ApiCredentials = new ApiCredentials("KEY", "SECRET");
-                restClientOptions.LogLevel = LogLevel.Trace;
-
-                // Point the logging to use the ILogger configuration, which uses Serilog here
-                restClientOptions.LogWriters = new List<ILogger> { _loggerFactory.CreateLogger<IBinanceClient>() };
-
-                socketClientOptions.ApiCredentials = new ApiCredentials("KEY", "SECRET");
-            });
-
-            BinanceClient.SetDefaultOptions(new BinanceClientOptions
+            services.AddBinance(restOptions =>
            {
-                ApiCredentials = new ApiCredentials("KEY", "SECRET"),
-                LogLevel = LogLevel.Trace
-            });
-
-            BinanceSocketClient.SetDefaultOptions(new BinanceSocketClientOptions
+                restOptions.ApiCredentials = new ApiCredentials("KEY", "SECRET");
+            }, socketOptions =>
            {
-                ApiCredentials = new ApiCredentials("KEY", "SECRET"),
+                socketOptions.ApiCredentials = new ApiCredentials("KEY", "SECRET");
            });

-            services.AddTransient<IBinanceClient, BinanceClient>();
-            services.AddScoped<IBinanceSocketClient, BinanceSocketClient>();
-
            services.AddBitfinex();
            services.AddBittrex();
            services.AddBybit();
            services.AddCoinEx();
-            services.AddFTX();
            services.AddHuobi();
            services.AddKraken();
            services.AddKucoin();
@@ -13,7 +13,6 @@
@using Bittrex.Net.Interfaces.Clients;
@using Bybit.Net.Interfaces.Clients;
@using CoinEx.Net.Interfaces.Clients;
-@using FTX.Net.Interfaces.Clients;
@using Huobi.Net.Interfaces.Clients;
@using Kraken.Net.Interfaces.Clients;
@using Kucoin.Net.Interfaces.Clients;
@@ -6,15 +6,14 @@
  </PropertyGroup>

 	<ItemGroup>
-		<PackageReference Include="Binance.Net" Version="8.0.6" />
-	<PackageReference Include="Bitfinex.Net" Version="5.0.3" />
-	<PackageReference Include="Bittrex.Net" Version="7.0.4" />
-	<PackageReference Include="Bybit.Net" Version="0.0.4" />
-	<PackageReference Include="CoinEx.Net" Version="5.0.3" />
-	<PackageReference Include="FTX.Net" Version="1.0.4" />
-	<PackageReference Include="Huobi.Net" Version="4.0.4" />
-	<PackageReference Include="KrakenExchange.Net" Version="3.0.3" />
-		<PackageReference Include="Kucoin.Net" Version="4.0.3" />
+		<PackageReference Include="Binance.Net" Version="9.0.1" />
+	<PackageReference Include="Bitfinex.Net" Version="6.0.0" />
+	<PackageReference Include="Bittrex.Net" Version="8.0.0" />
+	<PackageReference Include="Bybit.Net" Version="3.0.0" />
+	<PackageReference Include="CoinEx.Net" Version="6.0.0" />
+	<PackageReference Include="Huobi.Net" Version="5.0.0" />
+	<PackageReference Include="KrakenExchange.Net" Version="4.0.0" />
+		<PackageReference Include="Kucoin.Net" Version="5.0.0" />
 	</ItemGroup>

 </Project>
@@ -17,21 +17,21 @@ namespace ConsoleClient.Exchanges

        public async Task<WebCallResult> CancelOrder(string symbol, string id)
        {
-            using var client = new BinanceClient();
+            using var client = new BinanceRestClient();
            var result = await client.SpotApi.Trading.CancelOrderAsync(symbol, long.Parse(id));
            return result.AsDataless();
        }

        public async Task<Dictionary<string, decimal>> GetBalances()
        {
-            using var client = new BinanceClient();
+            using var client = new BinanceRestClient();
            var result = await client.SpotApi.Account.GetAccountInfoAsync();
            return result.Data.Balances.ToDictionary(b => b.Asset, b => b.Total);
        }

        public async Task<IEnumerable<OpenOrder>> GetOpenOrders()
        {
-            using var client = new BinanceClient();
+            using var client = new BinanceRestClient();
            var result = await client.SpotApi.Trading.GetOpenOrdersAsync();
            // Should check result success status here
            return result.Data.Select(o => new OpenOrder
@@ -49,7 +49,7 @@ namespace ConsoleClient.Exchanges

        public async Task<decimal> GetPrice(string symbol)
        {
-            using var client = new BinanceClient();
+            using var client = new BinanceRestClient();
            var result = await client.SpotApi.ExchangeData.GetPriceAsync(symbol);
            // Should check result success status here
            return result.Data.Price;
@@ -57,7 +57,7 @@ namespace ConsoleClient.Exchanges

        public async Task<WebCallResult<string>> PlaceOrder(string symbol, string side, string type, decimal quantity, decimal? price)
        {
-            using var client = new BinanceClient();
+            using var client = new BinanceRestClient();
            var result = await client.SpotApi.Trading.PlaceOrderAsync(
                symbol,
                side.ToLower() == "buy" ? Binance.Net.Enums.OrderSide.Buy: Binance.Net.Enums.OrderSide.Sell, 
@@ -70,7 +70,7 @@ namespace ConsoleClient.Exchanges

        public async Task<UpdateSubscription> SubscribePrice(string symbol, Action<decimal> handler)
        {
-            var sub = await _socketClient.SpotStreams.SubscribeToMiniTickerUpdatesAsync(symbol, data => handler(data.Data.LastPrice));
+            var sub = await _socketClient.SpotApi.ExchangeData.SubscribeToMiniTickerUpdatesAsync(symbol, data => handler(data.Data.LastPrice));
            return sub.Data;
        }
    }
@@ -0,0 +1,75 @@
+using Bybit.Net.Clients;
+using Bybit.Net.Interfaces.Clients;
+using ConsoleClient.Models;
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Sockets;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConsoleClient.Exchanges
+{
+    internal class BybitExchange : IExchange
+    {
+        private IBybitSocketClient _socketClient = new BybitSocketClient();
+
+        public async Task<WebCallResult> CancelOrder(string symbol, string id)
+        {
+            using var client = new BybitRestClient();
+            var result = await client.V5Api.Trading.CancelOrderAsync(Bybit.Net.Enums.Category.Spot, symbol, id);
+            return result.AsDataless();
+        }
+
+        public async Task<Dictionary<string, decimal>> GetBalances()
+        {
+            using var client = new BybitRestClient();
+            var result = await client.V5Api.Account.GetBalancesAsync(Bybit.Net.Enums.AccountType.Spot);
+            return result.Data.List.First().Assets.ToDictionary(d => d.Asset, d => d.WalletBalance);
+        }
+
+        public async Task<IEnumerable<OpenOrder>> GetOpenOrders()
+        {
+            using var client = new BybitRestClient();
+            var order = await client.V5Api.Trading.GetOrdersAsync(Bybit.Net.Enums.Category.Spot);
+            return order.Data.List.Select(o => new OpenOrder
+            {
+                Symbol = o.Symbol,
+                OrderSide = o.Side.ToString(),
+                OrderStatus = o.Status.ToString(),
+                OrderTime = o.CreateTime,
+                OrderType = o.OrderType.ToString(),
+                Price = o.Price ?? 0,
+                Quantity = o.Quantity,
+                QuantityFilled = o.QuantityFilled ?? 0
+            });
+        }
+
+        public async Task<decimal> GetPrice(string symbol)
+        {
+            using var client = new BybitRestClient();
+            var result = await client.V5Api.ExchangeData.GetSpotTickersAsync(symbol);
+            return result.Data.List.First().LastPrice;
+        }
+
+        public async Task<WebCallResult<string>> PlaceOrder(string symbol, string side, string type, decimal quantity, decimal? price)
+        {
+            using var client = new BybitRestClient();
+            var result = await client.V5Api.Trading.PlaceOrderAsync(
+                Bybit.Net.Enums.Category.Spot,
+                symbol,
+                side.ToLower() == "buy" ? Bybit.Net.Enums.OrderSide.Buy : Bybit.Net.Enums.OrderSide.Sell,
+                type == "market" ? Bybit.Net.Enums.NewOrderType.Market : Bybit.Net.Enums.NewOrderType.Limit,
+                quantity,
+                price: price);
+            return result.As(result.Data?.OrderId.ToString());
+        }
+
+        public async Task<UpdateSubscription> SubscribePrice(string symbol, Action<decimal> handler)
+        {
+            var sub = await _socketClient.V5SpotApi.SubscribeToTickerUpdatesAsync(symbol, data => handler(data.Data.LastPrice));
+            return sub.Data;
+        }
+    }
+}
@@ -1,74 +0,0 @@
-using ConsoleClient.Models;
-using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Sockets;
-using FTX.Net.Clients;
-using FTX.Net.Interfaces.Clients;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConsoleClient.Exchanges
-{
-    internal class FTXExchange : IExchange
-    {
-        private IFTXSocketClient _socketClient = new FTXSocketClient();
-
-        public async Task<WebCallResult> CancelOrder(string symbol, string id)
-        {
-            using var client = new FTXClient();
-            var result = await client.TradeApi.Trading.CancelOrderAsync(long.Parse(id));
-            return result.AsDataless();
-        }
-
-        public async Task<Dictionary<string, decimal>> GetBalances()
-        {
-            using var client = new FTXClient();
-            var result = await client.TradeApi.Account.GetBalancesAsync();
-            return result.Data.ToDictionary(d => d.Asset, d => d.Total);
-        }
-
-        public async Task<IEnumerable<OpenOrder>> GetOpenOrders()
-        {
-            using var client = new FTXClient();
-            var order = await client.TradeApi.Trading.GetOpenOrdersAsync();
-            return order.Data.Select(o => new OpenOrder
-            {
-                Symbol = o.Symbol,
-                OrderSide = o.Side.ToString(),
-                OrderStatus = o.Status.ToString(),
-                OrderTime = o.CreateTime,
-                OrderType = o.Type.ToString(),
-                Price = o.Price ?? 0,
-                Quantity = o.Quantity,
-                QuantityFilled = o.QuantityFilled ?? 0
-            });
-        }
-
-        public async Task<decimal> GetPrice(string symbol)
-        {
-            using var client = new FTXClient();
-            var result = await client.TradeApi.ExchangeData.GetSymbolAsync(symbol);
-            return result.Data.LastPrice ?? 0;
-        }
-
-        public async Task<WebCallResult<string>> PlaceOrder(string symbol, string side, string type, decimal quantity, decimal? price)
-        {
-            using var client = new FTXClient();
-            var result = await client.TradeApi.Trading.PlaceOrderAsync(
-                symbol,
-                side.ToLower() == "buy" ? FTX.Net.Enums.OrderSide.Buy : FTX.Net.Enums.OrderSide.Sell,
-                type == "market" ? FTX.Net.Enums.OrderType.Market : FTX.Net.Enums.OrderType.Limit,
-                quantity,
-                price: price);
-            return result.As(result.Data?.Id.ToString());
-        }
-
-        public async Task<UpdateSubscription> SubscribePrice(string symbol, Action<decimal> handler)
-        {
-            var sub = await _socketClient.Streams.SubscribeToTickerUpdatesAsync(symbol, data => handler(data.Data.LastPrice ?? 0));
-            return sub.Data;
-        }
-    }
-}
@@ -5,12 +5,10 @@ using System.Linq;
 using System.Threading.Tasks;
 using Binance.Net.Clients;
 using Binance.Net.Objects;
+using Bybit.Net.Clients;
 using ConsoleClient.Exchanges;
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Sockets;
-using FTX.Net.Clients;
-using FTX.Net.Objects;
-using Microsoft.Extensions.Logging;

 namespace ConsoleClient
 {
@@ -19,20 +17,18 @@ namespace ConsoleClient
        static Dictionary<string, IExchange> _exchanges = new Dictionary<string, IExchange>
        {
            { "Binance", new BinanceExchange() },
-            { "FTX", new FTXExchange() }
+            { "Bybit", new BybitExchange() }
        };

        static async Task Main(string[] args)
        {
-            BinanceClient.SetDefaultOptions(new BinanceClientOptions
+            BinanceRestClient.SetDefaultOptions(options =>
            {
-                LogLevel = LogLevel.Trace,
-                ApiCredentials = new ApiCredentials("APIKEY", "APISECRET")
+                options.ApiCredentials = new ApiCredentials("APIKEY", "APISECRET");
            });
-            FTXClient.SetDefaultOptions(new FTXClientOptions
+            BybitRestClient.SetDefaultOptions(options =>
            {
-                LogLevel = LogLevel.Trace,
-                ApiCredentials = new ApiCredentials("APIKEY", "APISECRET")
+                options.ApiCredentials = new ApiCredentials("APIKEY", "APISECRET");
            });

            while (true)
@@ -8,16 +8,121 @@ CryptoExchange.Net is a base package which can be used to easily implement crypt
 ## Discord
 A Discord server is available [here](https://discord.gg/MSpeEtSY8t). Feel free to join for discussion and/or questions around the CryptoExchange.Net and implementation libraries.

-## Donate / Sponsor
-I develop and maintain this package on my own for free in my spare time. Donations are greatly appreciated. If you prefer to donate any other currency please contact me.
+## Support the project
+I develop and maintain this package on my own for free in my spare time, any support is greatly appreciated.

-**Btc**:  12KwZk3r2Y3JZ2uMULcjqqBvXmpDwjhhQS  
-**Eth**:  0x069176ca1a4b1d6e0b7901a6bc0dbf3bb0bf5cc2  
-**Nano**: xrb_1ocs3hbp561ef76eoctjwg85w5ugr8wgimkj8mfhoyqbx4s1pbc74zggw7gs  
+### Referral link
+Use one of the following following referral links to signup to a new exchange to pay a small percentage of the trading fees you pay to support the project instead of paying them straight to the exchange. This doesn't cost you a thing!
+[Binance](https://accounts.binance.com/en/register?ref=10153680)  
+[Bitfinex](https://www.bitfinex.com/sign-up?refcode=kCCe-CNBO)  
+[Bittrex](https://bittrex.com/discover/join?referralCode=TST-DJM-CSX)  
+[Bybit](https://partner.bybit.com/b/jkorf)  
+[CoinEx](https://www.coinex.com/register?refer_code=hd6gn)  
+[FTX](https://ftx.com/referrals#a=31620192)  
+[Huobi](https://www.huobi.com/en-us/v/register/double-invite/?inviter_id=11343840&invite_code=fxp93)  
+[Kucoin](https://www.kucoin.com/ucenter/signup?rcode=RguMux)  

-Alternatively, sponsor me on Github using [Github Sponsors](https://github.com/sponsors/JKorf)  
+### Donate
+Make a one time donation in a crypto currency of your choice. If you prefer to donate a currency not listed here please contact me.
+
+**Btc**:  bc1qz0jv0my7fc60rxeupr23e75x95qmlq6489n8gh  
+**Eth**:  0x8E21C4d955975cB645589745ac0c46ECA8FAE504  
+
+### Sponsor
+Alternatively, sponsor me on Github using [Github Sponsors](https://github.com/sponsors/JKorf). 

 ## Release notes
+* Version 6.0.3 - 23 Jul 2023
+    * Fixed Proxy not getting applied in rest clients when not using DI
+
+* Version 6.0.2 - 05 Jul 2023
+    * Added properties generic dictionary to SocketConnection
+
+* Version 6.0.1 - 29 Jun 2023
+    * Added LogLevel optional parameter to TraceLoggerProvider
+
+* Version 6.0.0 - 25 Jun 2023
+    * Updated ApiCredentials to support RSA signing as well as the default Hmac signature
+    * Removed custom logging implementation in favor of using `Microsoft.Extensions.Logging` ILogger directly
+    * Refactored client options for easier use
+    * Added easier way of switching environments
+    * Added ResponseLength and ToString() override on WebCallResult object
+    * Fixed memory leak in AsyncResetEvent
+
+* Version 5.4.3 - 14 Apr 2023
+    * Fixed potential threading exception in socket connection
+
+* Version 5.4.2 - 01 Apr 2023
+    * Reverted socket changes as it seems to cause reconnect to hang
+
+* Version 5.4.1 - 18 Mar 2023
+    * Added CalculateTradableAmount to SymbolOrderBook
+    * Improved socket reconnect robustness
+    * Fixed api rate limiter not working correctly
+
+* Version 5.4.0 - 14 Feb 2023
+    * Added unsubscribing when receiving subscribe answer after the request timeout has passed
+    * Fixed socket options copying
+    * Made TimeSync implementation optional
+    * Cleaned up ApiCredentials and added better support for extending ApiCredentials
+
+* Version 5.3.1 - 08 Dec 2022
+    * Added default request parameter ordering before applying authentication
+    * Fixed possible issue where a socket would reconnect when it should close if it was already in reconnecting
+
+* Version 5.3.0 - 14 Nov 2022
+    * Reworked client architecture, shifting funcationality to the ApiClient
+    * Fixed ArrayConverter exponent parsing
+    * Fixed ArrayConverter not checking null
+    * Added optional delay setting after establishing socket connection
+    * Added callback for revitalizing a socket request when reconnecting
+    * Fixed proxy setting websocket
+
+* Version 5.2.4 - 31 Jul 2022
+    * Added handling of PlatformNotSupportedException when trying to use websocket from WebAssembly
+    * Changed DataEvent to have a public constructor for testing purposes
+    * Fixed EnumConverter serializing values without proper quotes
+    * Fixed websocket connection reconnecting too quickly when resubscribing/reauthenticating fails
+
+* Version 5.2.3 - 19 Jul 2022
+    * Fixed socket getting disconnected when `no data` timeout is reached instead of being reconnected
+
+* Version 5.2.2 - 17 Jul 2022
+    * Added support for retrieving a new url when socket connection is lost and reconnection will happen
+
+* Version 5.2.1 - 16 Jul 2022
+    * Fixed socket reconnect issue
+    * Fixed `message not handled` messages after unsubscribing
+    * Fixed error returning for non-json error responses
+
+* Version 5.2.0 - 10 Jul 2022
+    * Refactored websocket code, removed some clutter and simplified
+    * Added ReconnectAsync and GetSubscriptionsState methods on socket clients
+
+* Version 5.1.12 - 12 Jun 2022
+    * Changed time sync so requests no longer wait for it to complete unless it's the first time
+    * Made log client options changable after client creation
+    * Fixed proxy setting not used when reconnecting socket
+    * Changed MaxSocketConnections to a client options
+    * Updated socket reconnection logic
+
+* Version 5.1.12 - 12 Jun 2022
+    * Changed time sync so requests no longer wait for it to complete unless it's the first time
+    * Made log client options changable after client creation
+    * Fixed proxy setting not used when reconnecting socket
+    * Updated socket reconnection logic
+
+* Version 5.1.11 - 24 May 2022
+    * Added KeepAliveInterval setting
+    * Fixed port not being copied when setting parameters on request
+    * Fixed inconsistent PackageReference casing in csproj
+
+* Version 5.1.10 - 22 May 2022
+    * Fixed order book reconnecting while Diposed
+    * Fixed exception when disposing socket client while reconnecting
+    * Added additional null/default checking in DateTimeConverter
+    * Changed ConnectionLost subscription event to run in seperate task to prevent exception/longer operations from intervering with reconnecting
+
 * Version 5.1.9 - 08 May 2022
    * Added latency to the timesync calculation
    * Small fix for exception in socket close handling
@@ -5,22 +5,23 @@ nav_order: 2

 ## How to use the library

-Each implementation generally provides two different clients, which will be the access point for the API's. First of the rest client, which is typically available via [ExchangeName]Client, and a socket client, which is generally named [ExchangeName]SocketClient. For example `BinanceClient` and `BinanceSocketClient`.
+Each implementation generally provides two different clients, which will be the access point for the API's. First of is the rest client, which is typically available via [ExchangeName]RestClient, and a socket client, which is generally named [ExchangeName]SocketClient. For example `BinanceRestClient` and `BinanceSocketClient`.

 ## Rest client
 The rest client gives access to the Rest endpoint of the API. Rest endpoints are accessed by sending an HTTP request and receiving a response. The client is split in different sub-clients, which are named API Clients. These API clients are then again split in different topics. Typically a Rest client will look like this:

- KucoinClient
-	- SpotApi
-		- Account
-		- ExchangeData
-		- Trading
-	- FuturesApi
-		- Account
-		- ExchangeData
-		- Trading
-		
+- [ExchangeName]RestClient
+    - SpotApi
+        - Account
+        - ExchangeData
+        - Trading
+    - FuturesApi
+        - Account
+        - ExchangeData
+        - Trading
+        
 This rest client has 2 different API clients, the `SpotApi` and the `FuturesApi`, each offering their own set of endpoints.  
+
 *Requesting ticker info on the spot API*
 ```csharp
 var client = new KucoinClient();
@@ -30,7 +31,7 @@ var tickersResult = kucoinClient.SpotApi.ExchangeData.GetTickersAsync();
 Structuring the client like this should make it easier to find endpoints and allows for separate options and functionality for different API clients. For example, some API's have totally separate API's for futures, with different base addresses and different API credentials, while other API's have implemented this in the same API. Either way, this structure can facilitate a similar interface.

 ### Rest API client
-The Api clients are parts of the total API with a common identifier. In the previous Kucoin example, it separates the Spot and the Futures API. This again is then separated into topics. Most Rest clients implement the following structure:  
+The Api clients are parts of the total API with a common identifier. In the previous example, it separates the Spot and the Futures API. This again is then separated into topics. Most Rest clients implement the following structure:  

 **Account**  
 Endpoints related to the user account. This can for example be endpoints for accessing account settings, or getting account balances. The endpoints in this topic will require API credentials to be provided in the client options.
@@ -44,35 +45,41 @@ Endpoints related to trading. These are endpoints for placing and retrieving ord

 ### Processing request responses
 Each request will return a WebCallResult<T> with the following properties:  
-`ResponseHeaders`: The headers returned from the server
-`ResponseStatusCode`: The status code as returned by the server
-`Success`: Whether or not the call was successful. If successful the `Data` property will contain the resulting data, if not successful the `Error` property will contain more details about what the issue was
-`Error`: Details on what went wrong with a call. Only filled when `Success` == `false`
-`Data`: Data returned by the server
+`RequestHeaders`: The headers send to the server in the request message  
+`RequestMethod`: The Http method of the request  
+`RequestUrl`: The url the request was send to  
+`ResponseLength`: The length in bytes of the response message  
+`ResponseTime`: The duration between sending the request and receiving the response  
+`ResponseHeaders`: The headers returned from the server  
+`ResponseStatusCode`: The status code as returned by the server  
+`Success`: Whether or not the call was successful. If successful the `Data` property will contain the resulting data, if not successful the `Error` property will contain more details about what the issue was  
+`Error`: Details on what went wrong with a call. Only filled when `Success` == `false`  
+`OriginalData`: Will contain the originally received unparsed data if this has been enabled in the client options
+`Data`: Data returned by the server, only available if `Success` == `true`  

-When processing the result of a call it should always be checked for success. Not doing so will result in `NullReference` exceptions.
+When processing the result of a call it should always be checked for success. Not doing so will result in `NullReference` exceptions when the call fails for whatever reason.

 *Check call result*
 ```csharp
 var callResult = await kucoinClient.SpotApi.ExchangeData.GetTickersAsync();
 if(!callResult.Success)
 {
-	Console.WriteLine("Request failed: " + callResult.Error);
-	return;
+    Console.WriteLine("Request failed: " + callResult.Error);
+    return;
 }

 Console.WriteLine("Result: " + callResult.Data);
 ```

 ## Socket client
-The socket client gives access to the websocket API of an exchange. Websocket API's offer streams to which updates are pushed to which a client can listen. Some exchanges also offer some degree of functionality by allowing clients to give commands via the websocket, but most exchanges only allow this via the Rest API.
+The socket client gives access to the websocket API of an exchange. Websocket API's offer streams to which updates are pushed to which a client can listen, and sometimes also allow request/response communication.
 Just like the Rest client is divided in Rest Api clients, the Socket client is divided into Socket Api clients, each with their own range of API functionality. Socket Api clients are generally not divided into topics since the number of methods isn't as big as with the Rest client. To use the Kucoin client as example again, it looks like this:

 ```csharp

 - KucoinSocketClient
-	- SpotStreams
-	- FuturesStreams
+    - SpotStreams
+    - FuturesStreams

 ```
 *Subscribing to updates for all tickers on the Spot Api*
@@ -80,7 +87,7 @@ Just like the Rest client is divided in Rest Api clients, the Socket client is d
 var subscribeResult = kucoinSocketClient.SpotStreams.SubscribeToAllTickerUpdatesAsync(DataHandler);
 ```

-Subscribe methods require a data handler parameter, which is the method which will be called when an update is received from the server. This can be the name of a method or a lambda expression.  
+Subscribe methods always require a data handler parameter, which is the method which will be called when an update is received from the server. This can be the name of a method or a lambda expression.  

 *Method reference*
 ```csharp
@@ -88,7 +95,7 @@ await kucoinSocketClient.SpotStreams.SubscribeToAllTickerUpdatesAsync(DataHandle

 private static void DataHandler(DataEvent<KucoinStreamTick> updateData)
 {
-	// Process updateData
+    // Process updateData
 }
 ```

@@ -96,31 +103,35 @@ private static void DataHandler(DataEvent<KucoinStreamTick> updateData)
 ```csharp
 await kucoinSocketClient.SpotStreams.SubscribeToAllTickerUpdatesAsync(updateData =>
 {
-	// Process updateData
+    // Process updateData
 });
 ```

-All updates are wrapped in a `DataEvent<>` object, which contain a `Timestamp`, `OriginalData`, `Topic`, and a `Data` property. The `Timestamp` is the timestamp when the data was received (not send!). `OriginalData` will contain the originally received data if this has been enabled in the client options. `Topic` will contain the topic of the update, which is typically the symbol or asset the update is for. The `Data` property contains the received update data.
+All updates are wrapped in a `DataEvent<>` object, which contain the following properties:  
+`Timestamp`: The timestamp when the data was received (not send!)  
+`OriginalData`: Will contain the originally received unparsed data if this has been enabled in the client options  
+`Topic`: Will contain the topic of the update, which is typically the symbol or asset the update is for  
+`Data`: Contains the received update data.

-*[WARNING] Do not use `using` statements in combination with constructing a `SocketClient`. Doing so will dispose the `SocketClient` instance when the subscription is done, which will result in the connection getting closed. Instead assign the socket client to a variable outside of the method scope.*
+*[WARNING] Do not use `using` statements in combination with constructing a `SocketClient` without blocking the thread. Doing so will dispose the `SocketClient` instance when the subscription is done, which will result in the connection getting closed. Instead assign the socket client to a variable outside of the method scope.*

 ### Processing subscribe responses
-Subscribing to a stream will return a `CallResult<UpdateSubscription>` object. This should be checked for success the same was as the [rest client](#processing-request-responses). The `UpdateSubscription` object can be used to listen for connection events of the socket connection. 
+Subscribing to a stream will return a `CallResult<UpdateSubscription>` object. This should be checked for success the same way as a [rest request](#processing-request-responses). The `UpdateSubscription` object can be used to listen for connection events of the socket connection. 
 ```csharp

 var subscriptionResult = await kucoinSocketClient.SpotStreams.SubscribeToAllTickerUpdatesAsync(DataHandler);
 if(!subscriptionResult.Success)
 {
-	Console.WriteLine("Failed to connect: " + subscriptionResult.Error);
-	return;
+    Console.WriteLine("Failed to connect: " + subscriptionResult.Error);
+    return;
 }
 subscriptionResult.Data.ConnectionLost += () =>
 {
-	Console.WriteLine("Connection lost");
+    Console.WriteLine("Connection lost");
 };
 subscriptionResult.Data.ConnectionRestored += (time) =>
 {
-	Console.WriteLine("Connection restored");
+    Console.WriteLine("Connection restored");
 };

 ```
@@ -158,34 +169,3 @@ await kucoinSocketClient.UnsubscribeAsync(subscriptionResult.Data.Id);
 When you need to unsubscribe all current subscriptions on a client you can call `UnsubscribeAllAsync` on the client to unsubscribe all streams and close all connections.


-## Dependency injection
-Each library offers a `Add[Library]` extension method for `IServiceCollection`, which allows you to add the clients to the service collection. It also provides a callback for setting the client options. See this example for adding the `BinanceClient`:
-```csharp
-public void ConfigureServices(IServiceCollection services)
-{
-	services.AddBinance((restClientOptions, socketClientOptions) => {
-		restClientOptions.ApiCredentials = new ApiCredentials("KEY", "SECRET");
-		restClientOptions.LogLevel = LogLevel.Trace;
-
-		socketClientOptions.ApiCredentials = new ApiCredentials("KEY", "SECRET");
-	});
-}
-```
-Doing client registration this way will add the `IBinanceClient` as a transient service, and the `IBinanceSocketClient` as a scoped service.
-
-Alternatively, the clients can be registered manually:
-```csharp
-BinanceClient.SetDefaultOptions(new BinanceClientOptions
-{
-	ApiCredentials = new ApiCredentials("KEY", "SECRET"),
-	LogLevel = LogLevel.Trace
-});
-
-BinanceSocketClient.SetDefaultOptions(new BinanceSocketClientOptions
-{
-	ApiCredentials = new ApiCredentials("KEY", "SECRET"),
-});
-
-services.AddTransient<IBinanceClient, BinanceClient>();
-services.AddScoped<IBinanceSocketClient, BinanceSocketClient>();
-```
@@ -1,6 +1,6 @@
 ---
 title: FAQ
-nav_order: 11
+nav_order: 12
 ---

 ## Frequently asked questions
@@ -28,7 +28,7 @@ private void SomeMethod()
 {
  var socketClient = new BinanceSocketClient();
  socketClient.Spot.SubscribeToOrderBookUpdates("BTCUSDT", data => {
-	// Handle data
+    // Handle data
  });
 }
 ```
@@ -41,24 +41,20 @@ private BinanceSocketClient _socketClient = new BinanceSocketClient();
 private void SomeMethod()
 {
  _socketClient.Spot.SubscribeToOrderBookUpdates("BTCUSDT", data => {
-	// Handle data
+    // Handle data
  });
 }

 ```

 ### Can I use the TestNet/US/other API with this library
-Yes, generally these are all supported and can be configured by setting the BaseAddress in the client options. Some known API addresses should be available in the [Exchange]ApiAddresses class. For example:
+Yes, generally these are all supported and can be configured by setting the Environment in the client options. Some known environments should be available in the [Exchange]Environment class. For example:
 ```csharp
-var client = new BinanceClient(new BinanceClientOptions
+var client = new BinanceRestClient(options =>
 {
-	SpotApiOptions = new BinanceApiClientOptions
-	{
-		BaseAddress = BinanceApiAddresses.TestNet.RestClientAddress
-	},
-	UsdFuturesApiOptions = new BinanceApiClientOptions
-	{
-		BaseAddress = BinanceApiAddresses.TestNet.UsdFuturesRestClientAddress
-	}
+    options.Environment = BinanceEnvironment.Testnet;
 });
-```
+```
+
+### How are timezones handled / Timestamps are off by xx
+Exchange API's treat all timestamps as UTC, both incoming and outgoing. The client libraries do no conversion so be sure to use UTC as well.
@@ -1,6 +1,6 @@
 ---
 title: Glossary
-nav_order: 10
+nav_order: 11
 ---
 ## Terms and definitions

@@ -18,7 +18,7 @@ nav_order: 10
 |Network|Chain|The network of an asset. For example `ETH` allows multiple networks like `ERC20` and `BEP2`|
 |Order book|Market depth|A list of (the top rows of) the current best bids and asks|
 |Ticker|Stats|Statistics over the last 24 hours|
-|Client implementation|Library|An implementation of the `CrytpoExchange.Net` library. For example `Binance.Net` or `FTX.Net`|
+|Client implementation|Library|An implementation of the `CrytpoExchange.Net` library. For example `Binance.Net` or `Bybit.Net`|

 ### Other naming conventions
 #### PlaceOrderAsync
@@ -1,6 +1,6 @@
 ---
 title: Common interfaces
-nav_order: 5
+nav_order: 7
 ---

 ## Shared interfaces
@@ -1,320 +1,114 @@
 ---
-title: Log config
-nav_order: 4
+title: Logging
+nav_order: 5
 ---

 ## Configuring logging
-The library offers extensive logging, for which you can supply your own logging implementation. The logging can be configured via the client options (see [Client options](https://github.com/JKorf/CryptoExchange.Net/wiki/Options)). The examples here are using the `BinanceClient` but they should be the same for each implementation.
+The library offers extensive logging, which depends on the dotnet `Microsoft.Extensions.Logging.ILogger` interface. This should provide ease of use when connecting the library logging to your existing logging implementation.

-Logging is based on the `Microsoft.Extensions.Logging.ILogger` interface. This should provide ease of use when connecting the library logging to your existing logging implementation.
-
-## Serilog
-To make the CryptoExchange.Net logging write to the Serilog logger you can use the following methods, depending on the type of project you're using. The following examples assume that the `Serilog.Sinks.Console` package is already installed.
-
-### Dotnet hosting
-
-With for example an ASP.Net Core or Blazor project the logging can be added to the dependency container, which you can then use to inject it into the client. Make sure to install the `Serilog.AspNetCore` package (https://github.com/serilog/serilog-aspnetcore).
-
-<Details>
-<Summary>
-Using ILogger injection
-
-</Summary>
-<BlockQuote>
-Adding `UseSerilog()` in the `CreateHostBuilder` will add the Serilog logging implementation as an ILogger which you can inject into implementations.
-
-*Configuring Serilog as ILogger:*
+*Configure logging to write to the console*
 ```csharp
+IServiceCollection services = new ServiceCollection();
+services
+    .AddBinance()
+    .AddLogging(options =>
+    {
+        options.SetMinimumLevel(LogLevel.Trace);
+        options.AddConsole();
+    });
+```

-public static void Main(string[] args)
+The library provides a TraceLogger ILogger implementation which writes log messages using `Trace.WriteLine`, but any other logging library can be used.
+
+*Configure logging to use trace logging*
+```csharp
+IServiceCollection serviceCollection = new ServiceCollection();
+serviceCollection.AddBinance()
+    .AddLogging(options =>
+    {
+        options.SetMinimumLevel(LogLevel.Trace);
+        options.AddProvider(new TraceLoggerProvider());
+    });
+```
+
+### Using an external logging library and dotnet DI
+
+With for example an ASP.Net Core or Blazor project the logging can be configured by the dependency container, which can then automatically be used be the clients.
+The next example shows how to use Serilog. This assumes the `Serilog.AspNetCore` package (https://github.com/serilog/serilog-aspnetcore) is installed.
+
+*Using serilog:*
+```csharp
+using Binance.Net;
+using Serilog;
+
+Log.Logger = new LoggerConfiguration()
+        .MinimumLevel.Debug()
+        .WriteTo.Console()
+        .CreateLogger();
+
+var builder = WebApplication.CreateBuilder(args);
+builder.Services.AddBinance();
+builder.Host.UseSerilog();
+var app = builder.Build();
+
+// startup
+
+app.Run();
+```
+
+### Logging without dotnet DI
+If you don't have a dependency injection service available because you are for example working on a simple console application you have 2 options for logging.
+
+#### Create a ServiceCollection manually and get the client from the service provider
+
+```csharp
+IServiceCollection serviceCollection = new ServiceCollection();
+serviceCollection.AddBinance();
+serviceCollection.AddLogging(options =>
 {
-	Log.Logger = new LoggerConfiguration()
-		.MinimumLevel.Debug()
-		.WriteTo.Console()
-		.CreateLogger();
+    options.SetMinimumLevel(LogLevel.Trace);
+    options.AddConsole();
+}).BuildServiceProvider();

-	CreateHostBuilder(args).Build().Run();
-}
+var client = serviceCollection.GetRequiredService<IBinanceRestClient>();

-public static IHostBuilder CreateHostBuilder(string[] args) =>
-	Host.CreateDefaultBuilder(args)
-		.UseSerilog()
-		.ConfigureWebHostDefaults(webBuilder =>
-		{
-			webBuilder.UseStartup<Startup>();
-		});
-				
 ```

+#### Create a LoggerFactory manually

-*Injecting ILogger:*
 ```csharp
-
-public class BinanceDataProvider
-{
-	BinanceClient _client;
-
-	public BinanceDataProvider(ILogger<BinanceDataProvider> logger)
-	{
-		_client = new BinanceClient(new BinanceClientOptions
-		{
-			LogLevel = LogLevel.Trace,
-			LogWriters = new List<ILogger> { logger }
-		});
-
-	}
-}
-
+var logFactory = new LoggerFactory();
+logFactory.AddProvider(new ConsoleLoggerProvider());
+var binanceClient = new BinanceRestClient(new HttpClient(), logFactory, options => { });
 ```

-</BlockQuote>
-</Details>
-
-<Details>
-<Summary>
-Using Add[Library] extension method
-
-</Summary>
-<BlockQuote>
-When using the `Add[Library]` extension method, for instance `AddBinance()`, there is a small issue that there is no available `ILogger<>` yet when adding the library. This can be solved as follows:
-
-*Configuring Serilog as ILogger:*
-```csharp
-
-public static void Main(string[] args)
-{
-	Log.Logger = new LoggerConfiguration()
-		.MinimumLevel.Debug()
-		.WriteTo.Console()
-		.CreateLogger();
-
-	CreateHostBuilder(args).Build().Run();
-}
-
-public static IHostBuilder CreateHostBuilder(string[] args) =>
-	Host.CreateDefaultBuilder(args)
-		.ConfigureWebHostDefaults(webBuilder =>
-		{
-			webBuilder.UseStartup(
-				context => new Startup(context.Configuration, LoggerFactory.Create(config => config.AddSerilog()) )); // <- this allows us to use ILoggerFactory in the Startup.cs
-		});
-				
-```
-
-
-*Injecting ILogger:*
-```csharp
-
-public class Startup
-{
-	private ILoggerFactory _loggerFactory;
-
-	public Startup(IConfiguration configuration, ILoggerFactory loggerFactory)
-	{
-		Configuration = configuration;
-		_loggerFactory = loggerFactory;
-	}
-	
-	/* .. rest of class .. */
-	
-	public void ConfigureServices(IServiceCollection services)
-	{
-		services.AddBinance((restClientOptions, socketClientOptions) => {
-			// Point the logging to use the ILogger configuration
-			restClientOptions.LogWriters = new List<ILogger> { _loggerFactory.CreateLogger<IBinanceClient>() };
-		});
-		
-		// Rest of service registrations
-	}
-}
-
-```
-
-</BlockQuote>
-</Details>
-
-### Console application
-If you don't have a dependency injection service available because you are for example working on a simple console application you can use a slightly different approach.  
-
-*Configuring Serilog as ILogger:*
-```csharp
-var serilogLogger = new LoggerConfiguration()
-	.MinimumLevel.Debug()
-	.WriteTo.Console()
-	.CreateLogger();
-
-var loggerFactory = (ILoggerFactory)new LoggerFactory();
-loggerFactory.AddSerilog(serilogLogger);
-
-```
-
-*Injecting ILogger:*
-```csharp
-
-var client = new BinanceClient(new BinanceClientOptions
-{
-	LogLevel = LogLevel.Trace,
-	LogWriters = new List<ILogger> { loggerFactory.CreateLogger("") }
-});
-```
-
-The `BinanceClient` will now write the logging it produces to the Serilog logger.
-
-## Log4Net
-
-To make the CryptoExchange.Net logging write to the Log4Net logge with for example an ASP.Net Core or Blazor project the logging can be added to the dependency container, which you can then use to inject it into the client you're using. Make sure to install the `Microsoft.Extensions.Logging.Log4Net.AspNetCore` package (https://github.com/huorswords/Microsoft.Extensions.Logging.Log4Net.AspNetCore). 
-Adding `AddLog4Net()` in the `ConfigureLogging` call will add the Log4Net implementation as an ILogger which you can inject into implementations. Make sure you have a log4net.config configuration file in your project.
-
-*Configuring Log4Net as ILogger:*
-```csharp
-public static IHostBuilder CreateHostBuilder(string[] args) =>
-	Host.CreateDefaultBuilder(args)
-		.ConfigureWebHostDefaults(webBuilder =>
-		{
-			webBuilder.ConfigureLogging(logging =>
-			{
-				logging.AddLog4Net();
-				logging.SetMinimumLevel(LogLevel.Trace);
-			});
-			webBuilder.UseStartup<Startup>();
-		});
-```
-
-*Injecting ILogger:*
-```csharp
-
-public class BinanceDataProvider
-{
-	BinanceClient _client;
-
-	public BinanceDataProvider(ILogger<BinanceDataProvider> logger)
-	{
-		_client = new BinanceClient(new BinanceClientOptions
-		{
-			LogLevel = LogLevel.Trace,
-			LogWriters = new List<ILogger> { logger }
-		});
-
-	}
-}
-
-```
-
-If you don't have the Dotnet dependency container available you'll need to provide your own ILogger implementation. See [Custom logger](#custom-logger).
-
-## NLog
-To make the CryptoExchange.Net logging write to the NLog logger you can use the following ways, depending on the type of project you're using.
-
-### Dotnet hosting
-
-With for example an ASP.Net Core or Blazor project the logging can be added to the dependency container, which you can then use to inject it into the client you're using. Make sure to install the `NLog.Web.AspNetCore` package (https://github.com/NLog/NLog/wiki/Getting-started-with-ASP.NET-Core-5). 
-Adding `UseNLog()` to the `CreateHostBuilder()` method will add the NLog implementation as an ILogger which you can inject into implementations. Make sure you have a nlog.config configuration file in your project.
-
-*Configuring NLog as ILogger:*
-```csharp
- public static IHostBuilder CreateHostBuilder(string[] args) =>
-    Host.CreateDefaultBuilder(args)
-        .ConfigureWebHostDefaults(webBuilder =>
-        {
-            webBuilder.UseStartup<Startup>();
-        })
-         .ConfigureLogging(logging =>
-         {
-             logging.ClearProviders();
-             logging.SetMinimumLevel(LogLevel.Trace);
-         })
-        .UseNLog();
-```
-
-*Injecting ILogger:*
-```csharp
-
-public class BinanceDataProvider
-{
-	BinanceClient _client;
-
-	public BinanceDataProvider(ILogger<BinanceDataProvider> logger)
-	{
-		_client = new BinanceClient(new BinanceClientOptions
-		{
-			LogLevel = LogLevel.Trace,
-			LogWriters = new List<ILogger> { logger }
-		});
-
-	}
-}
-
-```
-
-If you don't have the Dotnet dependency container available you'll need to provide your own ILogger implementation. See [Custom logger](#custom-logger).
-
-## Custom logger
-If you're using a different framework or for some other reason these methods don't work for you you can create a custom ILogger implementation to receive the logging. All you need to do is create an implementation of the ILogger interface and provide that to the client.
-
-*A simple console logging implementation (note that the ConsoleLogger is already available in the CryptoExchange.Net library)*:
-```csharp
-
-public class ConsoleLogger : ILogger
-{
-	public IDisposable BeginScope<TState>(TState state) => null;
-
-	public bool IsEnabled(LogLevel logLevel) => true;
-
-	public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
-	{
-		var logMessage = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | {logLevel} | {formatter(state, exception)}";
-		Console.WriteLine(logMessage);
-	}
-}
-
-```
-
-*Injecting the console logging implementation:*
-```csharp
-
-var client = new BinanceClient(new BinanceClientOptions
-{
-	LogLevel = LogLevel.Trace,
-	LogWriters = new List<ILogger> { new ConsoleLogger() }
-});
-
-```
-
-## Provide logging for issues
+## Providing logging for issues
 A big debugging tool when opening an issue on Github is providing logging of what data caused the issue. This can be provided two ways, via the `OriginalData` property of the call result or data event, or collecting the Trace logging.
 ### OriginalData
 This is only useful when there is an issue in deserialization. So either a call result is giving a Deserialization error, or the result has a value that is unexpected. If that is the issue, please provide the original data that is received so the deserialization issue can be resolved based on the received data.
 By default the `OriginalData` property in the `WebCallResult`/`DataEvent` object is not filled as saving the original data has a (very small) performance penalty. To save the original data in the `OriginalData` property the `OutputOriginalData` option should be set to `true` in the client options.  
 *Enabled output data*
 ```csharp
-var client = new BinanceClient(new BinanceClientOptions
+var client = new BinanceClient(options =>
 {
-	OutputOriginalData = true
+    options.OutputOriginalData = true
 });
 ``` 

 *Accessing original data*
 ```csharp
 // Rest request
-var tickerResult = client.SpotApi.ExchangeData.GetTickersAsync();
-var originallyRecievedData = tickerResult.OriginalData;
+var tickerResult = await client.SpotApi.ExchangeData.GetTickersAsync();
+var originallyReceivedData = tickerResult.OriginalData;

 // Socket update
-client.SpotStreams.SubscribeToAllTickerUpdatesAsync(update => {
-	var originallyRecievedData = update.OriginalData;
+await client.SpotStreams.SubscribeToAllTickerUpdatesAsync(update => {
+    var originallyRecievedData = update.OriginalData;
 });
 ```

 ### Trace logging
-Trace logging, which is the most verbose log level, can be enabled in the client options.  
-*Enabled output data*
-```csharp
-var client = new BinanceClient(new BinanceClientOptions
-{
-	LogLevel = LogLevel.Trace
-});
-``` 
-After enabling trace logging all data send to/received from the server is written to the log writers. By default this is written to the output window in Visual Studio via Debug.WriteLine, though this might be different depending on how you configured your logging.
+Trace logging, which is the most verbose log level, will show everything the library does and includes the data that was send and received.  
 Output data will look something like this:
 ```
 2021-12-17 10:40:42:296 | Debug | Binance    | Client configuration: LogLevel: Trace, Writers: 1, OutputOriginalData: False, Proxy: -, AutoReconnect: True, ReconnectInterval: 00:00:05, MaxReconnectTries: , MaxResubscribeTries: 5, MaxConcurrentResubscriptionsPerSocket: 5, SocketResponseTimeout: 00:00:10, SocketNoDataTimeout: 00:00:00, SocketSubscriptionsCombineTarget: , CryptoExchange.Net: v5.0.0.0, Binance.Net: v8.0.0.0
@@ -323,3 +117,34 @@ Output data will look something like this:
 2021-12-17 10:40:43:024 | Debug | Binance    | [15] Response received in 571ms: {"symbol":"BTCUSDT","priceChange":"-1726.47000000","priceChangePercent":"-3.531","weightedAvgPrice":"48061.51544204","prevClosePrice":"48901.44000000","lastPrice":"47174.97000000","lastQty":"0.00352000","bidPrice":"47174.96000000","bidQty":"0.65849000","askPrice":"47174.97000000","askQty":"0.13802000","openPrice":"48901.44000000","highPrice":"49436.43000000","lowPrice":"46749.55000000","volume":"33136.69765000","quoteVolume":"1592599905.80360790","openTime":1639647642763,"closeTime":1639734042763,"firstId":1191596486,"lastId":1192649611,"count":1053126}
 ```
 When opening an issue, please provide this logging when available.
+
+### Example of serilog config and minimal API's
+
+```csharp
+using Binance.Net;
+using Binance.Net.Interfaces.Clients;
+using Serilog;
+
+Log.Logger = new LoggerConfiguration()
+        .MinimumLevel.Debug()
+        .WriteTo.Console()
+        .CreateLogger();
+
+var builder = WebApplication.CreateBuilder(args);
+builder.Services.AddBinance();
+builder.Host.UseSerilog();
+var app = builder.Build();
+
+// startup
+
+app.Urls.Add("http://localhost:3000");
+
+app.MapGet("/price/{symbol}", async (string symbol) =>
+{
+    var client = app.Services.GetRequiredService<IBinanceRestClient>();
+    var result = await client.SpotApi.ExchangeData.GetPriceAsync(symbol);
+    return result.Data.Price;
+});
+
+app.Run();
+```
@@ -1,100 +1,73 @@
 ---
-title: Migrate v4 to v5
-nav_order: 9
+title: Migrate v5 to v6
+nav_order: 10
 ---

-## Migrating from version 4 to version 5
-When updating your code from version 4 implementations to version 5 implementations you will encounter a fair bit of breaking changes. Here is the general outline for changes made in the CryptoExchange.Net library. For more specific changes for each library visit the library migration guide.
+## Migrating from version 5 to version 6
+When updating your code from version 5 implementations to version 6 implementations you will encounter some breaking changes. Here is the general outline of changes made in the CryptoExchange.Net library. For more specific changes for each library visit the library migration guide.

-*NOTE when updating it is not possible to have some client implementations use a V4 version and some clients a V5. When updating all libraries should be migrated*
+*NOTE when updating it is not possible to have some client implementations use a V5 version and some clients a V6. When updating all libraries should be migrated*

-## Client structure
-The client structure has been changed to make clients more consistent across different implementations. Clients using V4 either had `client.Method()`, `client.[Api].Method()` or `client.[Api].[Topic].Method()`.  
+## Rest client name
+To be more clear about different clients for different API's the rest client implementations have been renamed from [Exchange]Client to [Exchange]RestClient. This makes it more clear that it only implements the Rest API and the [Exchange]SocketClient the Socket API.

-This has been unified to be `client.[Api]Api.[Topic].Method()`:  
-`bittrexClient.GetTickersAsync()` -> `bittrexClient.SpotApi.ExchangeData.GetTickersAsync()`  
-`kucoinClient.Spot.GetTickersAsync()` -> `kucoinClient.SpotApi.ExchangeData.GetTickersAsync()`  
-`binanceClient.Spot.Market.GetTickersAsync()` -> `binanceClient.SpotApi.ExchangeData.GetTickersAsync()`  
+## Options
+Option parameters have been changed to a callback instead of an options object. This makes processing of the options easier and is in line with how dotnet handles option configurations.

-Socket clients are restructured as `client.[Api]Streams.Method()`:
-`bittrexClient.SpotStreams.SubscribeToTickerUpdatesAsync()`  
-`kucoinClient.SpotStreams.SubscribeToTickerUpdatesAsync()`  
-`binanceClient.SpotStreams.SubscribeToAllTickerUpdatesAsync()`  
+**BaseAddress**  
+The BaseAddress option has been replaced by the Environment option. The Environment options allows for selection/switching between different trade environments more easily. For example the environment can be switched between a testnet and live by changing only a single line instead of having to change all BaseAddresses.  

+**LogLevel/LogWriters**  
+The logging options have been removed and are now inherited by the DI configuration. See [Logging](https://jkorf.github.io/CryptoExchange.Net/Logging.html) for more info.  

-## Options structure
-The options have been changed in 2 categories, options for the whole client, and options only for a specific sub Api. Some options might no longer be available on the base level and should be set on the Api options instead, for example the `BaseAddress`. 
-The following example sets some basic options, and specifically overwrites the USD futures Api options to use the test net address and different Api credentials:  
-*V4*
+**HttpClient**
+The HttpClient will now be received by the DI container instead of having to pass it manually. When not using DI it is still possible to provide a HttpClient, but it is now located in the client constructor.
+
+*V5*  
 ```csharp
-var binanceClient = new BinanceClient(new BinanceApiClientOptions{
-	LogLevel = LogLevel.Trace,
-	RequestTimeout = TimeSpan.FromSeconds(60),
-	ApiCredentials = new ApiCredentials("API KEY", "API SECRET"),
-	BaseAddressUsdtFutures = new ApiCredentials("OTHER API KEY ONLY FOR USD FUTURES", "OTHER API SECRET ONLY FOR USD FUTURES")
-	// No way to set separate credentials for the futures API
+var client = new BinanceClient(new BinanceClientOptions(){
+    OutputOriginalData = true,
+    SpotApiOptions = new RestApiOptions {
+      BaseAddress = BinanceApiAddresses.TestNet.RestClientAddress
+    }
+    // Other options
 });
 ```

-*V5*
+*V6*  
 ```csharp
-var binanceClient = new BinanceClient(new BinanceClientOptions()
+var client = new BinanceClient(options => {
+    options.OutputOriginalData = true;
+    options.Environment = BinanceEnvironment.Testnet;
+    // Other options
+});
+```
+
+## Socket api name
+As socket API's are often more than just streams to subscribe to the name of the socket API clients have been changed from [Topic]Streams to [Topic]Api which matches the rest API client names. For example `SpotStreams` has become `SpotApi`, so `binanceSocketClient.UsdFuturesStreams.SubscribeXXX` has become `binanceSocketClient.UsdFuturesApi.SubscribeXXX`.
+
+## Add[Exchange] extension method
+With the change in options providing the DI extension methods for the IServiceCollection have also been changed slightly. Also the socket clients will now be registered as Singleton by default instead of Scoped.
+
+*V5*  
+```csharp
+builder.Services.AddKucoin((restOpts, socketOpts) =>
 {
-	// Client options
-	LogLevel = LogLevel.Trace,
-	RequestTimeout = TimeSpan.FromSeconds(60),
-	ApiCredentials = new ApiCredentials("API KEY", "API SECRET"),
-	
-	// Set options specifically for the USD futures API
-	UsdFuturesApiOptions = new BinanceApiClientOptions
-	{
-		BaseAddress = BinanceApiAddresses.TestNet.UsdFuturesRestClientAddress,
-		ApiCredentials = new ApiCredentials("OTHER API KEY ONLY FOR USD FUTURES", "OTHER API SECRET ONLY FOR USD FUTURES")
-	}
+    restOpts.LogLevel = LogLevel.Debug;
+    restOpts.ApiCredentials = new KucoinApiCredentials("KEY", "SECRET", "PASS");
+    socketOpts.LogLevel = LogLevel.Debug;
+    socketOpts.ApiCredentials = new KucoinApiCredentials("KEY", "SECRET", "PASS");
+}, ServiceLifetime.Singleton);
+```
+
+*V6*  
+```csharp
+builder.Services.AddKucoin((restOpts) =>
+{
+    restOpts.ApiCredentials = new KucoinApiCredentials("KEY", "SECRET", "PASS");
+},
+(socketOpts) =>
+{
+    socketOpts.ApiCredentials = new KucoinApiCredentials("KEY", "SECRET", "PASS");
 });
-```
-See [Client options](https://github.com/JKorf/CryptoExchange.Net/wiki/Options) for more details on the specific options.
-
-## IExchangeClient
-The `IExchangeClient` has been replaced by the `ISpotClient` and `IFuturesClient`. Where previously the `IExchangeClient` was implemented on the base client level, the `ISpotClient`/`IFuturesClient` have been implemented on the sub-Api level.
-This, in combination with the client restructuring, allows for more logically implemented interfaces, see this example:  
-*V4*
-```csharp
-var spotClients = new [] {
-	(IExhangeClient)binanceClient,
-	(IExchangeClient)bittrexClient,
-	(IExchangeClient)kucoinClient.Spot
-};
-
-// There was no common implementation for futures client
-```
-
-*V5*
-```csharp
-var spotClients = new [] {
-	binanceClient.SpotApi.CommonSpotClient,
-	bittrexClient.SpotApi.CommonSpotClient,
-	kucoinClient.SpotApi.CommonSpotClient
-};
-
-var futuresClients = new [] {
-	binanceClient.UsdFuturesApi.CommonFuturesClient,
-	kucoinClient.FuturesApi.CommonFuturesClient
-};
-```
-
-Where the IExchangeClient was returning interfaces which were implemented by models from the exchange, the `ISpotClient`/`IFuturesClient` returns actual objects defined in the `CryptoExchange.Net` library. This shifts the responsibility of parsing 
-the library model to a shared model from the model class to the client class, which makes more sense and removes the need for separate library models to implement the same mapping logic. It also removes the need for the `Common` prefix on properties:  
-*V4*
-```csharp
-var kline = await ((IExhangeClient)binanceClient).GetKlinesAysnc(/*params*/);
-var closePrice = kline.CommonClose;
-```
-
-*V5*
-```csharp
-var kline = await binanceClient.SpotApi.ComonSpotClient.GetKlinesAysnc(/*params*/);
-var closePrice = kline.ClosePrice;
-```
-
-For more details on the interfaces see [Common interfaces](interfaces.html)
+```
@@ -1,6 +1,6 @@
 ---
 title: Client options
-nav_order: 3
+nav_order: 4
 ---

 ## Setting client options
@@ -10,10 +10,12 @@ Each implementation can be configured using client options. There are 2 ways to
 *Set the default options to use for new clients*
 ```csharp

-BinanceClient.SetDefaultOptions(new BinanceClientOptions
+BinanceClient.SetDefaultOptions(options =>
 {
-	LogLevel = LogLevel.Trace,
-	ApiCredentials = new ApiCredentials("KEY", "SECRET")
+    options.OutputOriginalData = true;
+    options.ApiCredentials = new ApiCredentials("KEY", "SECRET");
+	// Override the api credentials for the Spot API
+    options.SpotOptions.ApiCredentials = new ApiCredentials("SPOT-KEY", "SPOT-SECRET");
 });

 ```
@@ -21,10 +23,12 @@ BinanceClient.SetDefaultOptions(new BinanceClientOptions
 *Set the options to use for a single new client*
 ```csharp

-var client = new BinanceClient(new BinanceClientOptions
+var client = new BinanceClient(options =>
 {
-	LogLevel = LogLevel.Trace,
-	ApiCredentials = new ApiCredentials("KEY", "SECRET")
+    options.OutputOriginalData = true;
+    options.ApiCredentials = new ApiCredentials("KEY", "SECRET");
+	// Override the api credentials for the Spot API
+    options.SpotOptions.ApiCredentials = new ApiCredentials("SPOT-KEY", "SPOT-SECRET");
 });

 ```
@@ -32,39 +36,30 @@ var client = new BinanceClient(new BinanceClientOptions
 When calling `SetDefaultOptions` each client created after that will use the options that were set, unless the specific option is overriden in the options that were provided to the client. Consider the following example:
 ```csharp

-BinanceClient.SetDefaultOptions(new BinanceClientOptions
+BinanceClient.SetDefaultOptions(options =>
 {
-	LogLevel = LogLevel.Trace,
-	OutputOriginalData = true
+    options.OutputOriginalData = true;
 });

-var client = new BinanceClient(new BinanceClientOptions
+var client = new BinanceClient(options =>
 {
-	LogLevel = LogLevel.Debug,
-	ApiCredentials = new ApiCredentials("KEY", "SECRET")
+    options.OutputOriginalData = false;
 });

 ```

 The client instance will have the following options:  
-`LogLevel = Debug`  
-`OutputOriginalData = true`  
-`ApiCredentials = set`  
+`OutputOriginalData = false`  

 ## Api options
-The options are divided in two categories. The basic options, which will apply to everything the client does, and the Api options, which is limited to the specific API client (see [Clients](https://github.com/JKorf/CryptoExchange.Net/wiki/Clients)).
+The options are divided in two categories. The basic options, which will apply to everything the client does, and the Api options, which is limited to the specific API client (see [Clients](https://jkorf.github.io/CryptoExchange.Net/Clients.html)).

 ```csharp

-var client = new BinanceClient(new BinanceClientOptions
+var client = new BinanceRestClient(options =>
 {
-	LogLevel = LogLevel.Debug,
-	ApiCredentials = new ApiCredentials("GENERAL-KEY", "GENERAL-SECRET"),
-	SpotApiOptions = new BinanceApiClientOptions
-	{
-		ApiCredentials = new ApiCredentials("SPOT-KEY", "SPOT-SECRET")              ,
-		BaseAddress = BinanceApiAddresses.Us.RestClientAddress
-	}
+    options.ApiCredentials = new ApiCredentials("GENERAL-KEY", "GENERAL-SECRET"),
+    options.SpotOptions.ApiCredentials = new ApiCredentials("SPOT-KEY", "SPOT-SECRET");
 });

 ```
@@ -78,38 +73,39 @@ All clients have access to the following options, specific implementations might

 |Option|Description|Default|
 |------|-----------|-------|
-|`LogWriters`| A list of `ILogger`s to handle log messages. | `new List<ILogger> { new DebugLogger() }` |
-|`LogLevel`| The minimum log level before passing messages to the `LogWriters`. Messages with a more verbose level than the one specified here will be ignored. Setting this to `null` will pass all messages to the `LogWriters`.| `LogLevel.Information`
 |`OutputOriginalData`|If set to `true` the originally received Json data will be output as well as the deserialized object. For `RestClient` calls the data will be in the `WebCallResult<T>.OriginalData` property, for `SocketClient` subscriptions the data will be available in the `DataEvent<T>.OriginalData` property when receiving an update. | `false`
-|`ApiCredentials`| The API credentials to use for accessing protected endpoints. Typically a key/secret combination. Note that this is a `default` value for all API clients, and can be overridden per API client. See the `Base Api client options`| `null`
+|`ApiCredentials`| The API credentials to use for accessing protected endpoints. Can either be an API key/secret using Hmac encryption or an API key/private key using RSA encryption for exchanges that support that. See [Credentials](#credentials). Note that this is a `default` value for all API clients, and can be overridden per API client. See the `Base Api client options`| `null`
 |`Proxy`|The proxy to use for connecting to the API.| `null`
+|`RequestTimeout`|The timeout for client requests to the server| `TimeSpan.FromSeconds(20)`

 **Rest client options (extension of base client options)** 
 
 |Option|Description|Default|
 |------|-----------|-------|
-|`RequestTimeout`|The time out to use for requests.|`TimeSpan.FromSeconds(30)`|
-|`HttpClient`|The `HttpClient` instance to use for making requests. When creating multiple `RestClient` instances a single `HttpClient` should be provided to prevent each client instance from creating its own. *[WARNING] When providing the `HttpClient` instance in the options both the `RequestTimeout` and `Proxy` client options will be ignored and should be set on the provided `HttpClient` instance.*| `null` |
+|`AutoTimestamp`|Whether or not the library should attempt to sync the time between the client and server. If the time between server and client is not in sync authentication errors might occur. This option should be disabled when the client time sure to be in sync.|`true`|
+|`TimestampRecalculationInterval`|The interval of how often the time synchronization between client and server should be executed| `TimeSpan.FromHours(1)`
+|`Environment`|The environment the library should talk to. Some exchanges have testnet/sandbox environments which can be used instead of the real exchange. The environment option can be used to switch between different trade environments|`Live environment`

 **Socket client options (extension of base client options)**  

 |Option|Description|Default|
 |------|-----------|-------|
-|`AutoReconnect`|Whether or not the socket should automatically reconnect when disconnected.|`true`
+|`AutoReconnect`|Whether or not the socket should attempt to automatically reconnect when disconnected.|`true`
 |`ReconnectInterval`|The time to wait between connection tries when reconnecting.|`TimeSpan.FromSeconds(5)`
 |`SocketResponseTimeout`|The time in which a response is expected on a request before giving a timeout.|`TimeSpan.FromSeconds(10)`
 |`SocketNoDataTimeout`|If no data is received after this timespan then assume the connection is dropped. This is mainly used for API's which have some sort of ping/keepalive system. For example; the Bitfinex API will sent a heartbeat message every 15 seconds, so the `SocketNoDataTimeout` could be set to 20 seconds. On API's without such a mechanism this might not work because there just might not be any update while still being fully connected. | `default(TimeSpan)` (no timeout)
 |`SocketSubscriptionsCombineTarget`|The amount of subscriptions that should be made on a single socket connection. Not all exchanges support multiple subscriptions on a single socket. Setting this to a higher number increases subscription speed because not every subscription needs to connect to the server, but having more subscriptions on a single connection will also increase the amount of traffic on that single connection, potentially leading to issues.| Depends on implementation
-|`MaxReconnectTries`|The maximum amount of tries for reconnecting|`null` (infinite)
-|`MaxResubscribeTries`|The maximum amount of tries for resubscribing after successfully reconnecting the socket|5
 |`MaxConcurrentResubscriptionsPerSocket`|The maximum number of concurrent resubscriptions per socket when resubscribing after reconnecting|5
+|`MaxSocketConnections`|The maximum amount of distinct socket connections|`null`
+|`DelayAfterConnect`|The time to wait before sending messages after connecting to the server.|`TimeSpan.Zero`
+|`Environment`|The environment the library should talk to. Some exchanges have testnet/sandbox environments which can be used instead of the real exchange. The environment option can be used to switch between different trade environments|`Live environment`

 **Base Api client options**  

 |Option|Description|Default|
 |------|-----------|-------|
-|`ApiCredentials`|The API credentials to use for this specific API client. Will override any credentials provided in the base client options|
-|`BaseAddress`|The base address to the API. All calls to the API will use this base address as basis for the endpoints. This allows for swapping to test API's or swapping to a different cluster for example. Available base addresses are defined in the [Library]ApiAddresses helper class, for example `KucoinApiAddresses`|Depends on implementation
+|`ApiCredentials`|If set to `true` the originally received Json data will be output as well as the deserialized object. For `RestClient` calls the data will be in the `WebCallResult<T>.OriginalData` property, for `SocketClient` subscriptions the data will be available in the `DataEvent<T>.OriginalData` property when receiving an update. Overrides the Base client options `OutputOriginalData` option if set| `false`
+|`OutputOriginalData`|The base address to the API. All calls to the API will use this base address as basis for the endpoints. This allows for swapping to test API's or swapping to a different cluster for example. Available base addresses are defined in the [Library]ApiAddresses helper class, for example `KucoinApiAddresses`|Depends on implementation

 **Options for Rest Api Client (extension of base api client options)**  

@@ -117,6 +113,21 @@ All clients have access to the following options, specific implementations might
 |------|-----------|-------|
 |`RateLimiters`|A list of `IRateLimiter`s to use.|`new List<IRateLimiter>()`|
 |`RateLimitingBehaviour`|What should happen when a rate limit is reached.|`RateLimitingBehaviour.Wait`|
+|`AutoTimestamp`|Whether or not the library should attempt to sync the time between the client and server. If the time between server and client is not in sync authentication errors might occur. This option should be disabled when the client time sure to be in sync. Overrides the Rest client options `AutoTimestamp` option if set|`null`|
+|`TimestampRecalculationInterval`|The interval of how often the time synchronization between client and server should be executed. Overrides the Rest client options `TimestampRecalculationInterval` option if set| `TimeSpan.FromHours(1)`

 **Options for Socket Api Client (extension of base api client options)**  
-There are currently no specific options for socket API clients, the base API options are still available.
+
+|Option|Description|Default|
+|------|-----------|-------|
+|`SocketNoDataTimeout`|If no data is received after this timespan then assume the connection is dropped. This is mainly used for API's which have some sort of ping/keepalive system. For example; the Bitfinex API will sent a heartbeat message every 15 seconds, so the `SocketNoDataTimeout` could be set to 20 seconds. On API's without such a mechanism this might not work because there just might not be any update while still being fully connected. Overrides the Socket client options `SocketNoDataTimeout` option if set | `default(TimeSpan)` (no timeout)
+|`MaxSocketConnections`|The maximum amount of distinct socket connections. Overrides the Socket client options `MaxSocketConnections` option if set |`null`
+
+## Credentials
+Credentials are supported in 3 formats in the base library:  
+
+|Type|Description|Example|
+|----|-----------|-------|
+|`Hmac`|An API key + secret combination. The API key is send with the request and the secret is used to sign requests. This is the default authentication method on all exchanges. |`options.ApiCredentials = new ApiCredentials("51231f76e-9c503548-8fabs3f-rfgf12mkl3", "556be32-d563ba53-faa2dfd-b3n5c", CredentialType.Hmac);`|
+|`RsaPem`|An API key + a public and private key pair generated by the user. The public key is shared with the exchange, while the private key is used to sign requests. This CredentialType expects the private key to be in .pem format and is only supported in .netstandard2.1 due to limitations of the framework|`options.ApiCredentials = new ApiCredentials("432vpV8daAaXAF4Qg", ""-----BEGIN PRIVATE KEY-----[PRIVATEKEY]-----END PRIVATE KEY-----", CredentialType.RsaPem);`|
+|`RsaXml`|An API key + a public and private key pair generated by the user. The public key is shared with the exchange, while the private key is used to sign requests. This CredentialType expects the private key to be in xml format and is supported in .netstandard2.0 and .netstandard2.1, but it might mean the private key needs to be converted from the original format to xml|`options.ApiCredentials = new ApiCredentials("432vpV8daAaXAF4Qg", "<RSAKeyValue>[PRIVATEKEY]</RSAKeyValue>", CredentialType.RsaXml);`|
@@ -4,11 +4,11 @@ nav_order: 6
 ---

 ## Locally synced order book
-Each implementation provides an order book implementation. These implementations will provide a client side order book and will take care of synchronization with the server, and will handle reconnecting and resynchronizing in case of a dropped connection.
+Each exchange implementation provides an order book implementation. These implementations will provide a client side order book and will take care of synchronization with the server, and will handle reconnecting and resynchronizing in case of a dropped connection.
 Order book implementations are named as `[ExchangeName][Type]SymbolOrderBook`, for example `BinanceSpotSymbolOrderBook`. 

 ## Usage
-Start the book synchronization by calling the `StartAsync` method. This returns a success state whether the book is successfully synchronized and started. You can listen to the `OnStatusChange` event to be notified of when the status of a book changes. Note that the order book is only synchronized with the server when the state is `Synced`.
+Start the book synchronization by calling the `StartAsync` method. This returns whether the book is successfully synchronized and started. You can listen to the `OnStatusChange` event to be notified of when the status of a book changes. Note that the order book is only synchronized with the server when the state is `Synced`. When the order book has been started and the state changes from `Synced` to `Reconnecting` the book will automatically reconnect and resync itself.

 *Start an order book and print the top 3 rows*
 ```csharp
@@ -18,14 +18,15 @@ book.OnStatusChange += (oldState, newState) => Console.WriteLine($"State changed
 var startResult = await book.StartAsync();
 if (!startResult.Success)
 {
-	Console.WriteLine("Failed to start order book: " + startResult.Error);
-	return;
+    Console.WriteLine("Failed to start order book: " + startResult.Error);
+    return;
 }

 while(true)
 {
-	Console.WriteLine(book.ToString(3);
-	await Task.Delay(500);
+    Console.Clear();
+    Console.WriteLine(book.ToString(3);
+    await Task.Delay(500);
 }

 ```
@@ -54,4 +55,14 @@ book.OnStatusChange += (oldStatus, newStatus) => { Console.WriteLine($"State cha
 book.OnOrderBookUpdate += (bidsAsks) => { Console.WriteLine($"Order book changed: {bidsAsks.Asks.Count()} asks, {bidsAsks.Bids.Count()} bids"); };
 book.OnBestOffersChanged += (bestOffer) => { Console.WriteLine($"Best offer changed, best bid: {bestOffer.BestBid.Price}, best ask: {bestOffer.BestAsk.Price}"); };

-```
+```
+
+### Order book factory
+ Each exchange implementation also provides an order book factory for creating ISymbolOrderBook instances. The naming convention for the factory is `[Exchange]OrderBookFactory`, for example `BinanceOrderBookFactory`. This type will be automatically added when using DI and can be used to facilitate easier testing.
+ 
+ *Creating an order book using the order book factory*
+ ```csharp
+var factory = services.GetRequiredService<IKucoinOrderBookFactory>();
+var book = factory.CreateSpot("ETH-USDT");
+var startResult = await book.StartAsync();
+ ```
@@ -1,6 +1,6 @@
 ---
 title: Rate limiting
-nav_order: 7
+nav_order: 9
 ---

 ## Rate limiting
@@ -13,12 +13,12 @@ A rate limiter can be configured in the options like so:
 ```csharp
 new ClientOptions
 {
-	RateLimitingBehaviour = RateLimitingBehaviour.Wait,
-	RateLimiters = new List<IRateLimiter>
-	{
-		new RateLimiter()
-			.AddTotalRateLimit(50, TimeSpan.FromSeconds(10))
-	}
+    RateLimitingBehaviour = RateLimitingBehaviour.Wait,
+    RateLimiters = new List<IRateLimiter>
+    {
+        new RateLimiter()
+            .AddTotalRateLimit(50, TimeSpan.FromSeconds(10))
+    }
 }
 ```

@@ -26,8 +26,8 @@ This will add a rate limiter for 50 requests per 10 seconds.
 A rate limiter can have multiple limits:
 ```csharp
 new RateLimiter()
-			.AddTotalRateLimit(50, TimeSpan.FromSeconds(10))
-			.AddEndpointLimit("/api/order", 10, TimeSpan.FromSeconds(2))
+            .AddTotalRateLimit(50, TimeSpan.FromSeconds(10))
+            .AddEndpointLimit("/api/order", 10, TimeSpan.FromSeconds(2))
 ```
 This adds another limit of 10 requests per 2 seconds in addition to the 50 requests per 10 seconds limit.
 These are the available rate limit configurations:
@@ -17,7 +17,6 @@ These will always be on the latest CryptoExchange.Net version and the latest ver
 |<a href="https://github.com/JKorf/Bittrex.Net"><img src="https://github.com/JKorf/Bittrex.Net/blob/master/Bittrex.Net/Icon/icon.png?raw=true"></a>|Bittrex|https://jkorf.github.io/Bittrex.Net/|
 |<a href="https://github.com/JKorf/Bybit.Net"><img src="https://github.com/JKorf/Bybit.Net/blob/main/ByBit.Net/Icon/icon.png?raw=true"></a>|Bybit|https://jkorf.github.io/Bybit.Net/|
 |<a href="https://github.com/JKorf/CoinEx.Net"><img src="https://github.com/JKorf/CoinEx.Net/blob/master/CoinEx.Net/Icon/icon.png?raw=true"></a>|CoinEx|https://jkorf.github.io/CoinEx.Net/|
-|<a href="https://github.com/JKorf/FTX.Net"><img src="https://github.com/JKorf/FTX.Net/blob/main/FTX.Net/Icon/icon.png?raw=true"></a>|FTX|https://jkorf.github.io/FTX.Net/|
 |<a href="https://github.com/JKorf/Huobi.Net"><img src="https://github.com/JKorf/Huobi.Net/blob/master/Huobi.Net/Icon/icon.png?raw=true"></a>|Huobi|https://jkorf.github.io/Huobi.Net/|
 |<a href="https://github.com/JKorf/Kraken.Net"><img src="https://github.com/JKorf/Kraken.Net/blob/master/Kraken.Net/Icon/icon.png?raw=true"></a>|Kraken|https://jkorf.github.io/Kraken.Net/|
 |<a href="https://github.com/JKorf/Kucoin.Net"><img src="https://github.com/JKorf/Kucoin.Net/blob/master/Kucoin.Net/Icon/icon.png?raw=true"></a>|Kucoin|https://jkorf.github.io/Kucoin.Net/|
@@ -42,11 +41,24 @@ These might not be compatible with other libraries, make sure to check the Crypt
 ## Discord
 A Discord server is available [here](https://discord.gg/MSpeEtSY8t). Feel free to join for discussion and/or questions around the CryptoExchange.Net and implementation libraries.

-## Donate / Sponsor
-I develop and maintain this package on my own for free in my spare time. Donations are greatly appreciated. If you prefer to donate any other currency please contact me.
+## Support the project
+I develop and maintain this package on my own for free in my spare time, any support is greatly appreciated.

-**Btc**:  12KwZk3r2Y3JZ2uMULcjqqBvXmpDwjhhQS  
-**Eth**:  0x069176ca1a4b1d6e0b7901a6bc0dbf3bb0bf5cc2  
-**Nano**: xrb_1ocs3hbp561ef76eoctjwg85w5ugr8wgimkj8mfhoyqbx4s1pbc74zggw7gs  
+### Referral link
+Use one of the following following referral links to signup to a new exchange to pay a small percentage of the trading fees you pay to support the project instead of paying them straight to the exchange. This doesn't cost you a thing!
+[Binance](https://accounts.binance.com/en/register?ref=10153680)  
+[Bitfinex](https://www.bitfinex.com/sign-up?refcode=kCCe-CNBO)  
+[Bittrex](https://bittrex.com/discover/join?referralCode=TST-DJM-CSX)  
+[Bybit](https://partner.bybit.com/b/jkorf)  
+[CoinEx](https://www.coinex.com/register?refer_code=hd6gn)  
+[Huobi](https://www.huobi.com/en-us/v/register/double-invite/?inviter_id=11343840&invite_code=fxp93)  
+[Kucoin](https://www.kucoin.com/ucenter/signup?rcode=RguMux)  

-Alternatively, sponsor me on Github using [Github Sponsors](https://github.com/sponsors/JKorf)  
+### Donate
+Make a one time donation in a crypto currency of your choice. If you prefer to donate a currency not listed here please contact me.
+
+**Btc**:  bc1qz0jv0my7fc60rxeupr23e75x95qmlq6489n8gh  
+**Eth**:  0x8E21C4d955975cB645589745ac0c46ECA8FAE504  
+
+### Sponsor
+Alternatively, sponsor me on Github using [Github Sponsors](https://github.com/sponsors/JKorf).
Author	SHA1	Message	Date
JKorf	c62775813f	Updated version	2023-07-23 13:52:07 +02:00
JKorf	f11b3754f0	Fix for proxy when not using DI	2023-07-23 10:01:13 +02:00
JKorf	3cbe0465e9	Docs	2023-07-11 21:38:48 +02:00
JKorf	5048aea722	Updated version	2023-07-05 21:58:35 +02:00
Jkorf	c3316a51e7	Added properties dictionary to socket connection	2023-07-05 17:10:43 +02:00
JKorf	7ecf37064b	Updated version	2023-06-29 20:10:35 +02:00
JKorf	18954f4f53	Added optional log level parameter for trace logger	2023-06-29 20:07:26 +02:00
JKorf	00bc245102	Updated examples	2023-06-26 20:45:28 +02:00
JKorf	273cab9fdb	Docs	2023-06-25 21:43:30 +02:00
JKorf	84d0f0ec9e	Updated version	2023-06-25 20:25:02 +02:00
JKorf	690f2a63e5	Squashed commit of the following: commit 90f285d7f6bcd926ce9ca3d5832b1d70a5eae6ab Author: JKorf <jankorf91@gmail.com> Date: Sun Jun 25 19:51:12 2023 +0200 Docs commit 72187035c703d1402b37bd2f4c3e066706f28d67 Author: JKorf <jankorf91@gmail.com> Date: Sat Jun 24 16:02:53 2023 +0200 docs commit 8411977292f1fb0b6e0705b1ad675b79a5311d90 Author: JKorf <jankorf91@gmail.com> Date: Fri Jun 23 18:25:15 2023 +0200 wip commit cb7d33aad5d2751104c8b8a6c6eadbf0d36b672c Author: JKorf <jankorf91@gmail.com> Date: Fri Jun 2 19:26:26 2023 +0200 wip commit 4359a2d05ea1141cff516dab18f364a6ca854e18 Author: JKorf <jankorf91@gmail.com> Date: Wed May 31 20:51:36 2023 +0200 wip commit c6adb1b2f728d143f6bd667139c619581122a3c9 Author: JKorf <jankorf91@gmail.com> Date: Mon May 1 21:13:47 2023 +0200 wip commit 7fee733f82fa6ff574030452f0955c9e817647dd Author: JKorf <jankorf91@gmail.com> Date: Thu Apr 27 13:02:56 2023 +0200 wip commit f8057313ffc9b0c31effcda71d35d105ea390971 Author: JKorf <jankorf91@gmail.com> Date: Mon Apr 17 21:37:51 2023 +0200 wip	2023-06-25 19:58:46 +02:00
JKorf	19cc020852	Updated version	2023-04-14 21:03:36 +02:00
JKorf	1d4353e6d1	Fixed potential collection modified exception	2023-04-14 21:02:21 +02:00
JKorf	a02b3f88d7	Updated version	2023-04-01 19:00:22 +02:00
JKorf	af44ca4c9f	Logging	2023-04-01 18:58:52 +02:00
JKorf	cf2b57bb96	Revert "Test some changes for robustness" This reverts commit `1c33e297e7`.	2023-04-01 18:55:48 +02:00
JKorf	d0a2288910	Updated version	2023-03-18 14:58:09 +01:00
JKorf	89c11afc21	Fix Api key rate limit	2023-03-18 14:22:09 +01:00
JKorf	da6ed580f1	Added CalculateTradableAmount to SymbolOrderBook	2023-03-18 10:01:38 +01:00
JKorf	1c33e297e7	Test some changes for robustness	2023-02-18 10:41:26 +01:00
JKorf	0005534a95	Updated version	2023-02-14 20:10:13 +01:00
JKorf	11650f7c1a	Updated some interfaces, made time syncing methods nullable for apis not using it, added optional retry checking, removed private key from api credentials, added better support for api credentials subclasses	2023-02-13 21:18:45 +01:00
JKorf	a222bb3f02	Fixed socket client options setting, added automatic unsubscribe if the subscription confirmation comes in after request timeout	2023-02-12 14:05:00 +01:00
JKorf	6361c5ef25	Added message on authentication exception	2023-02-08 21:55:56 +01:00
Jkorf	892e8a4508	Updated version	2022-12-08 11:59:02 +01:00
Jkorf	8336d373f3	Small fix for socket possibly reconnecting while it should close	2022-12-08 11:54:10 +01:00
Jkorf	71072680a8	Small fixes DelayAfterConnect option	2022-12-08 11:02:02 +01:00
Jan Korf	e13f105019	Merge pull request #167 from alokym86/master order parameters before constructing request	2022-12-08 11:01:07 +01:00
alokym86	401577451e	order parameters order the request parameters before AuthenticateRequest invocation	2022-12-05 14:55:01 +02:00
JKorf	5c41ef1ee4	Updated version	2022-11-14 21:23:18 +01:00
JKorf	ad614830d1	Added optional delay after socket connection, added callback when reconnected socket to revitalize original request, fixed proxy setting socket	2022-11-13 19:47:33 +01:00
JKorf	3365837338	Updated tests	2022-11-13 15:31:28 +01:00
JKorf	66ac2972d6	wip	2022-11-02 17:59:33 +01:00
JKorf	0d3e05880a	Wip client work	2022-10-31 21:41:30 +01:00
JKorf	997e71f3b7	Merge branch 'master' of https://github.com/JKorf/CryptoExchange.Net	2022-10-28 20:02:37 +02:00
JKorf	b0fca4587d	Added null check array converter	2022-10-28 20:02:25 +02:00
Jan Korf	c10671768d	Merge pull request #160 from kulikov-dev/fix/155-format-conversion-error Fixing exponential format parsing	2022-10-15 13:34:00 +02:00
kulikov-dev	91e8123679	Fixing issue 155 with exponential format parsing (https://github.com/JKorf/CryptoExchange.Net/issues/155 )	2022-10-15 09:57:14 +06:00
JKorf	417cf2f9ac	Fixed nullability warning	2022-07-31 21:55:26 +02:00
JKorf	277be7ab9b	Updated version	2022-07-31 21:53:39 +02:00
JKorf	45f3459f59	Made DataEvent ctor public	2022-07-31 21:47:22 +02:00
JKorf	98dad4a8ed	Added handling for websocket options not being supported when running on WebAssembly	2022-07-31 21:45:19 +02:00
JKorf	1e5f19271b	Updated support docs	2022-07-31 14:51:47 +02:00
JKorf	8abeeb4cf0	Update Clients.md	2022-07-29 18:57:04 +02:00
JKorf	cae0cd9ead	Fixed EnumConverter serialization writing values without quotes	2022-07-27 21:26:17 +02:00
JKorf	811574ae01	Fixed websocket reconnecting too fast when reconnecting succeeds but resubscribing or authorization fails	2022-07-27 21:25:46 +02:00
JKorf	0ddecf7f8d	Updated version	2022-07-19 19:13:26 +02:00
JKorf	5bcf50fb4d	Fixed socket getting disconnected when no data timeout reached instead of being reconnected	2022-07-19 19:12:26 +02:00
JKorf	9f0654815d	Updated version	2022-07-17 12:50:50 +02:00
JKorf	465e9f04f4	Added support for retrieving a reconnection url when socket connection is lost	2022-07-17 12:49:13 +02:00
JKorf	7c8cbfa4e2	Updated version	2022-07-16 21:06:30 +02:00
JKorf	4c79d13ff9	Set error to the response content when an error response is received which isn't json	2022-07-15 16:55:18 +02:00
JKorf	c815fad135	Fix for Message not handled when closing subscription, fix for reconnect loop	2022-07-12 22:06:38 +02:00
JKorf	41f17d0378	Don't close socket after failed auth when already closing	2022-07-11 18:56:51 +02:00
JKorf	50715ff2f7	Squashed commit of the following: commit `0571ed17a0` Author: JKorf <jankorf91@gmail.com> Date: Sun Jul 10 19:56:27 2022 +0200 Fixed tests commit `99c331b389` Author: JKorf <jankorf91@gmail.com> Date: Sun Jul 10 16:41:14 2022 +0200 Updated version commit `70f8bd203a` Author: JKorf <jankorf91@gmail.com> Date: Sun Jul 10 16:36:00 2022 +0200 Finished up websocket refactoring commit `89b517c936` Author: JKorf <jankorf91@gmail.com> Date: Fri Jul 8 20:24:58 2022 +0200 wip commit `91e33cc42c` Author: JKorf <jankorf91@gmail.com> Date: Thu Jul 7 22:17:55 2022 +0200 wip	2022-07-10 19:57:10 +02:00
JKorf	ea9375d582	Updated version	2022-06-12 15:36:04 +02:00
JKorf	2cf3c93e5e	Cleanup	2022-06-12 15:35:35 +02:00
JKorf	ca888d8e41	Updated version	2022-06-12 15:31:03 +02:00
JKorf	2040b1c175	Fixed proxy setting not used on reconnecting socket	2022-06-12 15:26:11 +02:00
JKorf	d451c18821	No longer waiting for timesyncing to complete when it's not the first request	2022-06-12 15:21:22 +02:00
JKorf	c13dfa4461	Updated socket reconnection	2022-06-12 15:10:10 +02:00
JKorf	c2080ef75f	Made MaxSocketConnections a setting, added support for changing log settings after creating client	2022-06-11 13:31:39 +02:00
Jan Korf	6b252e8024	Update TestSocket.cs	2022-05-24 22:36:55 +02:00
Jan Korf	d06bd5f176	Updated version	2022-05-24 18:56:37 +02:00
Jan Korf	d55fc8da65	Merge pull request #144 from tamaw/fix/missing-port-on-baseuri Fixed: copying the port number when using a custom BaseAddress	2022-05-24 15:14:38 +02:00
Tama Waddell	01184f2c5d	Added port to the other overloaded method	2022-05-24 21:13:08 +10:00
Jan Korf	cadc93c2f0	Merge pull request #143 from andriibratanin/bugfix/fix-nuget-discovery Fix NuGet packages discovery for some IDEs	2022-05-24 10:21:21 +02:00
Tama Waddell	2600a51461	Included copying the port when using SetParameters	2022-05-24 15:16:06 +10:00
Andrii Bratanin	9e6a86ba8b	Fix wrong case in csproj files of tests projects #142	2022-05-24 01:31:25 +03:00
Jan Korf	c4430d63fa	Added KeepAliveInterval setting for socket connections	2022-05-23 22:05:04 +02:00
Jan Korf	f3e1cfef33	Updated version	2022-05-22 15:51:48 +02:00
Jan Korf	cc3053719c	Make socket ConnectionLost run in a separate task to prevent issue with long running/exceptions in the handler	2022-05-22 15:46:30 +02:00
Jan Korf	cd6907e601	Merge branch 'master' of https://github.com/jkorf/CryptoExchange.Net	2022-05-22 14:35:07 +02:00
Jan Korf	8fe00693bd	Merge pull request #141 from nathan-datusarator/master Add checks for Disposed	2022-05-22 11:41:55 +02:00
Jan Korf	fb90d1e015	Fixed exception when disposing client in reconnecting state	2022-05-22 11:35:39 +02:00
Jan Korf	4b44861e43	Added additional cases for no null/default handling in DateTimeConverter	2022-05-22 11:35:17 +02:00
Jan Korf	e42ca4ab5a	Update FAQ.md	2022-05-21 10:17:59 +02:00
Nathan Pfluger	5b97f6dd67	Move Subscription Events into non-lambda so they can be removed on StopAsync	2022-05-12 10:00:44 -07:00
Nathan Pfluger	a9813ecb0a	Add checks for Disposed	2022-05-12 09:05:27 -07:00