Updated version

* Implement high-performance logging

.gitignore

@@ -287,5 +287,3 @@ __pycache__/
 *.odx.cs
 *.xsd.cs
 CryptoExchange.Net/CryptoExchange.Net.xml
-/Docs/*
-Docs/

CryptoExchange.Net.UnitTests/AsyncResetEventTests.cs

@@ -1,5 +1,6 @@
 using CryptoExchange.Net.Objects;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -24,8 +25,8 @@ namespace CryptoExchange.Net.UnitTests
             var result1 = await waiter1;
             var result2 = await waiter2;
 
-            Assert.True(result1);
-            Assert.True(result2);
+            Assert.That(result1);
+            Assert.That(result2);
         }
 
         [Test]
@@ -39,8 +40,8 @@ namespace CryptoExchange.Net.UnitTests
             var result1 = await waiter1;
             var result2 = await waiter2;
 
-            Assert.True(result1);
-            Assert.True(result2);
+            Assert.That(result1);
+            Assert.That(result2);
         }
 
         [Test]
@@ -55,14 +56,14 @@ namespace CryptoExchange.Net.UnitTests
 
             var result1 = await waiter1;
 
-            Assert.True(result1);
-            Assert.True(waiter2.Status != TaskStatus.RanToCompletion);
+            Assert.That(result1);
+            Assert.That(waiter2.Status != TaskStatus.RanToCompletion);
 
             evnt.Set();
 
             var result2 = await waiter2;
 
-            Assert.True(result2);
+            Assert.That(result2);
         }
 
         [Test]
@@ -75,13 +76,13 @@ namespace CryptoExchange.Net.UnitTests
 
             var result1 = await waiter1;
 
-            Assert.True(result1);
-            Assert.True(waiter2.Status != TaskStatus.RanToCompletion);
+            Assert.That(result1);
+            Assert.That(waiter2.Status != TaskStatus.RanToCompletion);
             evnt.Set();
 
             var result2 = await waiter2;
 
-            Assert.True(result2);
+            Assert.That(result2);
         }
 
         [Test]
@@ -105,12 +106,12 @@ namespace CryptoExchange.Net.UnitTests
             for(var i = 1; i <= 10; i++)
             {
                 evnt.Set();
-                Assert.AreEqual(10 - i, waiters.Count(w => w.Status != TaskStatus.RanToCompletion));
+                Assert.That(10 - i == waiters.Count(w => w.Status != TaskStatus.RanToCompletion));
             }
 
             await resultsWaiter;
 
-            Assert.AreEqual(10, results.Count(r => r));
+            Assert.That(10 == results.Count(r => r));
         }
 
         [Test]
@@ -124,7 +125,7 @@ namespace CryptoExchange.Net.UnitTests
 
             var result1 = await waiter1;
 
-            Assert.True(result1);
+            Assert.That(result1);
         }
 
         [Test]
@@ -134,9 +135,9 @@ namespace CryptoExchange.Net.UnitTests
 
             var waiter1 = evnt.WaitAsync(TimeSpan.FromMilliseconds(100));
 
-            var result1 = await waiter1;            
+            var result1 = await waiter1;
 
-            Assert.False(result1);
+            ClassicAssert.False(result1);
         }
     }
 }

CryptoExchange.Net.UnitTests/BaseClientTests.cs

@@ -3,6 +3,7 @@ using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.UnitTests.TestImplementations;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 
@@ -21,7 +22,7 @@ namespace CryptoExchange.Net.UnitTests
             var result = client.SubClient.Deserialize<object>("{\"testProperty\": 123}");
 
             // assert
-            Assert.IsTrue(result.Success);
+            Assert.That(result.Success);
         }
 
         [TestCase]
@@ -34,8 +35,8 @@ namespace CryptoExchange.Net.UnitTests
             var result = client.SubClient.Deserialize<object>("{\"testProperty\": 123");
 
             // assert
-            Assert.IsFalse(result.Success);
-            Assert.IsTrue(result.Error != null);
+            ClassicAssert.IsFalse(result.Success);
+            Assert.That(result.Error != null);
         }
 
         [TestCase("https://api.test.com/api", new[] { "path1", "path2" }, "https://api.test.com/api/path1/path2")]
@@ -48,7 +49,7 @@ namespace CryptoExchange.Net.UnitTests
         public void AppendPathTests(string baseUrl, string[] path, string expected)
         {
             var result = baseUrl.AppendPath(path);
-            Assert.AreEqual(expected, result);
+            Assert.That(expected == result);
         }
     }
 }

CryptoExchange.Net.UnitTests/CallResultTests.cs

@@ -1,5 +1,6 @@
 using CryptoExchange.Net.Objects;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,9 +18,9 @@ namespace CryptoExchange.Net.UnitTests
         {
             var result = new CallResult(new ServerError("TestError"));
 
-            Assert.AreEqual(result.Error.Message, "TestError");
-            Assert.IsFalse(result);
-            Assert.IsFalse(result.Success);
+            ClassicAssert.AreSame(result.Error.Message, "TestError");
+            ClassicAssert.IsFalse(result);
+            ClassicAssert.IsFalse(result.Success);
         }
 
         [Test]
@@ -27,9 +28,9 @@ namespace CryptoExchange.Net.UnitTests
         {
             var result = new CallResult(null);
 
-            Assert.IsNull(result.Error);
-            Assert.IsTrue(result);
-            Assert.IsTrue(result.Success);
+            ClassicAssert.IsNull(result.Error);
+            Assert.That(result);
+            Assert.That(result.Success);
         }
 
         [Test]
@@ -37,10 +38,10 @@ namespace CryptoExchange.Net.UnitTests
         {
             var result = new CallResult<object>(new ServerError("TestError"));
 
-            Assert.AreEqual(result.Error.Message, "TestError");
-            Assert.IsNull(result.Data);
-            Assert.IsFalse(result);
-            Assert.IsFalse(result.Success);
+            ClassicAssert.AreSame(result.Error.Message, "TestError");
+            ClassicAssert.IsNull(result.Data);
+            ClassicAssert.IsFalse(result);
+            ClassicAssert.IsFalse(result.Success);
         }
 
         [Test]
@@ -48,10 +49,10 @@ namespace CryptoExchange.Net.UnitTests
         {
             var result = new CallResult<object>(new object());
 
-            Assert.IsNull(result.Error);
-            Assert.IsNotNull(result.Data);
-            Assert.IsTrue(result);
-            Assert.IsTrue(result.Success);
+            ClassicAssert.IsNull(result.Error);
+            ClassicAssert.IsNotNull(result.Data);
+            Assert.That(result);
+            Assert.That(result.Success);
         }
 
         [Test]
@@ -60,11 +61,11 @@ namespace CryptoExchange.Net.UnitTests
             var result = new CallResult<TestObjectResult>(new TestObjectResult());
             var asResult = result.As<TestObject2>(result.Data.InnerData);
 
-            Assert.IsNull(asResult.Error);
-            Assert.IsNotNull(asResult.Data);
-            Assert.IsTrue(asResult.Data is TestObject2);
-            Assert.IsTrue(asResult);
-            Assert.IsTrue(asResult.Success);
+            ClassicAssert.IsNull(asResult.Error);
+            ClassicAssert.IsNotNull(asResult.Data);
+            Assert.That(asResult.Data is not null);
+            Assert.That(asResult);
+            Assert.That(asResult.Success);
         }
 
         [Test]
@@ -73,11 +74,11 @@ namespace CryptoExchange.Net.UnitTests
             var result = new CallResult<TestObjectResult>(new ServerError("TestError"));
             var asResult = result.As<TestObject2>(default);
 
-            Assert.IsNotNull(asResult.Error);
-            Assert.AreEqual(asResult.Error.Message, "TestError");
-            Assert.IsNull(asResult.Data);
-            Assert.IsFalse(asResult);
-            Assert.IsFalse(asResult.Success);
+            ClassicAssert.IsNotNull(asResult.Error);
+            ClassicAssert.AreSame(asResult.Error.Message, "TestError");
+            ClassicAssert.IsNull(asResult.Data);
+            ClassicAssert.IsFalse(asResult);
+            ClassicAssert.IsFalse(asResult.Success);
         }
 
         [Test]
@@ -86,11 +87,11 @@ namespace CryptoExchange.Net.UnitTests
             var result = new CallResult<TestObjectResult>(new ServerError("TestError"));
             var asResult = result.AsError<TestObject2>(new ServerError("TestError2"));
 
-            Assert.IsNotNull(asResult.Error);
-            Assert.AreEqual(asResult.Error.Message, "TestError2");
-            Assert.IsNull(asResult.Data);
-            Assert.IsFalse(asResult);
-            Assert.IsFalse(asResult.Success);
+            ClassicAssert.IsNotNull(asResult.Error);
+            ClassicAssert.AreSame(asResult.Error.Message, "TestError2");
+            ClassicAssert.IsNull(asResult.Data);
+            ClassicAssert.IsFalse(asResult);
+            ClassicAssert.IsFalse(asResult.Success);
         }
 
         [Test]
@@ -99,11 +100,11 @@ namespace CryptoExchange.Net.UnitTests
             var result = new WebCallResult<TestObjectResult>(new ServerError("TestError"));
             var asResult = result.AsError<TestObject2>(new ServerError("TestError2"));
 
-            Assert.IsNotNull(asResult.Error);
-            Assert.AreEqual(asResult.Error.Message, "TestError2");
-            Assert.IsNull(asResult.Data);
-            Assert.IsFalse(asResult);
-            Assert.IsFalse(asResult.Success);
+            ClassicAssert.IsNotNull(asResult.Error);
+            ClassicAssert.AreSame(asResult.Error.Message, "TestError2");
+            ClassicAssert.IsNull(asResult.Data);
+            ClassicAssert.IsFalse(asResult);
+            ClassicAssert.IsFalse(asResult.Success);
         }
 
         [Test]
@@ -115,6 +116,7 @@ namespace CryptoExchange.Net.UnitTests
                 TimeSpan.FromSeconds(1),
                 null,
                 "{}",
+                1,
                 "https://test.com/api",
                 null,
                 HttpMethod.Get,
@@ -123,15 +125,15 @@ namespace CryptoExchange.Net.UnitTests
                 null);
             var asResult = result.AsError<TestObject2>(new ServerError("TestError2"));
 
-            Assert.IsNotNull(asResult.Error);
-            Assert.AreEqual(asResult.Error.Message, "TestError2");
-            Assert.AreEqual(asResult.ResponseStatusCode, System.Net.HttpStatusCode.OK);
-            Assert.AreEqual(asResult.ResponseTime, TimeSpan.FromSeconds(1));
-            Assert.AreEqual(asResult.RequestUrl, "https://test.com/api");
-            Assert.AreEqual(asResult.RequestMethod, HttpMethod.Get);
-            Assert.IsNull(asResult.Data);
-            Assert.IsFalse(asResult);
-            Assert.IsFalse(asResult.Success);
+            ClassicAssert.IsNotNull(asResult.Error);
+            Assert.That(asResult.Error.Message == "TestError2");
+            Assert.That(asResult.ResponseStatusCode == System.Net.HttpStatusCode.OK);
+            Assert.That(asResult.ResponseTime == TimeSpan.FromSeconds(1));
+            Assert.That(asResult.RequestUrl == "https://test.com/api");
+            Assert.That(asResult.RequestMethod == HttpMethod.Get);
+            ClassicAssert.IsNull(asResult.Data);
+            ClassicAssert.IsFalse(asResult);
+            ClassicAssert.IsFalse(asResult.Success);
         }
 
         [Test]
@@ -143,6 +145,7 @@ namespace CryptoExchange.Net.UnitTests
                 TimeSpan.FromSeconds(1),
                 null,
                 "{}",
+                1,
                 "https://test.com/api",
                 null,
                 HttpMethod.Get,
@@ -151,14 +154,14 @@ namespace CryptoExchange.Net.UnitTests
                 null);
             var asResult = result.As<TestObject2>(result.Data.InnerData);
 
-            Assert.IsNull(asResult.Error);
-            Assert.AreEqual(asResult.ResponseStatusCode, System.Net.HttpStatusCode.OK);
-            Assert.AreEqual(asResult.ResponseTime, TimeSpan.FromSeconds(1));
-            Assert.AreEqual(asResult.RequestUrl, "https://test.com/api");
-            Assert.AreEqual(asResult.RequestMethod, HttpMethod.Get);
-            Assert.IsNotNull(asResult.Data);
-            Assert.IsTrue(asResult);
-            Assert.IsTrue(asResult.Success);
+            ClassicAssert.IsNull(asResult.Error);
+            Assert.That(asResult.ResponseStatusCode == System.Net.HttpStatusCode.OK);
+            Assert.That(asResult.ResponseTime == TimeSpan.FromSeconds(1));
+            Assert.That(asResult.RequestUrl == "https://test.com/api");
+            Assert.That(asResult.RequestMethod == HttpMethod.Get);
+            ClassicAssert.IsNotNull(asResult.Data);
+            Assert.That(asResult);
+            Assert.That(asResult.Success);
         }
     }
 

CryptoExchange.Net.UnitTests/CryptoExchange.Net.UnitTests.csproj

@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <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="Microsoft.NET.Test.Sdk" Version="17.9.0"></PackageReference>
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="NUnit" Version="4.1.0"></PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"></PackageReference>
   </ItemGroup>
 
   <ItemGroup>

CryptoExchange.Net.UnitTests/ExchangeHelpersTests.cs

@@ -1,5 +1,6 @@
 using CryptoExchange.Net.Objects;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Globalization;
 
 namespace CryptoExchange.Net.UnitTests
@@ -16,7 +17,7 @@ namespace CryptoExchange.Net.UnitTests
         public void ClampValueTests(decimal min, decimal max, decimal input, decimal expected)
         {
             var result = ExchangeHelpers.ClampValue(min, max, input);
-            Assert.AreEqual(expected, result);
+            Assert.That(expected == result);
         }
 
         [TestCase(0.1, 1, 0.1, RoundingType.Down, 0.4, 0.4)]
@@ -33,7 +34,7 @@ namespace CryptoExchange.Net.UnitTests
         public void AdjustValueStepTests(decimal min, decimal max, decimal? step, RoundingType roundingType, decimal input, decimal expected)
         {
             var result = ExchangeHelpers.AdjustValueStep(min, max, step, roundingType, input);
-            Assert.AreEqual(expected, result);
+            Assert.That(expected == result);
         }
 
         [TestCase(0.1, 1, 2, RoundingType.Closest, 0.4, 0.4)]
@@ -48,7 +49,7 @@ namespace CryptoExchange.Net.UnitTests
         public void AdjustValuePrecisionTests(decimal min, decimal max, int? precision, RoundingType roundingType, decimal input, decimal expected)
         {
             var result = ExchangeHelpers.AdjustValuePrecision(min, max, precision, roundingType, input);
-            Assert.AreEqual(expected, result);
+            Assert.That(expected == result);
         }
 
         [TestCase(5, 0.1563158, 0.15631)]
@@ -59,7 +60,7 @@ namespace CryptoExchange.Net.UnitTests
         public void RoundDownTests(int decimalPlaces, decimal input, decimal expected)
         {
             var result = ExchangeHelpers.RoundDown(input, decimalPlaces);
-            Assert.AreEqual(expected, result);
+            Assert.That(expected == result);
         }
 
         [TestCase(0.1234560000, "0.123456")]
@@ -67,7 +68,7 @@ namespace CryptoExchange.Net.UnitTests
         public void NormalizeTests(decimal input, string expected)
         {
             var result = ExchangeHelpers.Normalize(input);
-            Assert.AreEqual(expected, result.ToString(CultureInfo.InvariantCulture));
+            Assert.That(expected == result.ToString(CultureInfo.InvariantCulture));
         }
     }
 }

CryptoExchange.Net.UnitTests/JsonNetConverterTests.cs

@@ -1,7 +1,9 @@
 using CryptoExchange.Net.Attributes;
 using CryptoExchange.Net.Converters;
+using CryptoExchange.Net.Converters.JsonNet;
 using Newtonsoft.Json;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,7 +13,7 @@ using System.Threading.Tasks;
 namespace CryptoExchange.Net.UnitTests
 {
     [TestFixture()]
-    public class ConverterTests
+    public class JsonNetConverterTests
     {
         [TestCase("2021-05-12")]
         [TestCase("20210512")]
@@ -20,12 +22,14 @@ namespace CryptoExchange.Net.UnitTests
         [TestCase("1620777600000")]
         [TestCase("2021-05-12T00:00:00.000Z")]
         [TestCase("2021-05-12T00:00:00.000000000Z")]
+        [TestCase("0.000000", true)]
+        [TestCase("0", true)]
         [TestCase("", true)]
         [TestCase("  ", true)]
         public void TestDateTimeConverterString(string input, bool expectNull = false)
         {
             var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": \"{input}\" }}");
-            Assert.AreEqual(output.Time, expectNull ? null: new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output.Time == (expectNull ? null: new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc)));
         }
 
         [TestCase(1620777600.000)]
@@ -33,7 +37,7 @@ namespace CryptoExchange.Net.UnitTests
         public void TestDateTimeConverterDouble(double input)
         {
             var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": {input} }}");
-            Assert.AreEqual(output.Time, new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output.Time == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
         }
 
         [TestCase(1620777600)]
@@ -44,7 +48,7 @@ namespace CryptoExchange.Net.UnitTests
         public void TestDateTimeConverterLong(long input, bool expectNull = false)
         {
             var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": {input} }}");
-            Assert.AreEqual(output.Time, expectNull ? null : new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output.Time == (expectNull ? null : new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc)));
         }
 
         [TestCase(1620777600)]
@@ -52,14 +56,14 @@ namespace CryptoExchange.Net.UnitTests
         public void TestDateTimeConverterFromSeconds(double input)
         {
             var output = DateTimeConverter.ConvertFromSeconds(input);
-            Assert.AreEqual(output, new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
         }
 
         [Test]
         public void TestDateTimeConverterToSeconds()
         {
             var output = DateTimeConverter.ConvertToSeconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
-            Assert.AreEqual(output, 1620777600);
+            Assert.That(output == 1620777600);
         }
 
         [TestCase(1620777600000)]
@@ -67,49 +71,49 @@ namespace CryptoExchange.Net.UnitTests
         public void TestDateTimeConverterFromMilliseconds(double input)
         {
             var output = DateTimeConverter.ConvertFromMilliseconds(input);
-            Assert.AreEqual(output, new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
         }
 
         [Test]
         public void TestDateTimeConverterToMilliseconds()
         {
             var output = DateTimeConverter.ConvertToMilliseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
-            Assert.AreEqual(output, 1620777600000);
+            Assert.That(output == 1620777600000);
         }
 
         [TestCase(1620777600000000)]
         public void TestDateTimeConverterFromMicroseconds(long input)
         {
             var output = DateTimeConverter.ConvertFromMicroseconds(input);
-            Assert.AreEqual(output, new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
         }
 
         [Test]
         public void TestDateTimeConverterToMicroseconds()
         {
             var output = DateTimeConverter.ConvertToMicroseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
-            Assert.AreEqual(output, 1620777600000000);
+            Assert.That(output == 1620777600000000);
         }
 
         [TestCase(1620777600000000000)]
         public void TestDateTimeConverterFromNanoseconds(long input)
         {
             var output = DateTimeConverter.ConvertFromNanoseconds(input);
-            Assert.AreEqual(output, new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
         }
 
         [Test]
         public void TestDateTimeConverterToNanoseconds()
         {
             var output = DateTimeConverter.ConvertToNanoseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
-            Assert.AreEqual(output, 1620777600000000000);
+            Assert.That(output == 1620777600000000000);
         }
 
         [TestCase()]
         public void TestDateTimeConverterNull()
         {
             var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": null }}");
-            Assert.AreEqual(output.Time, null);
+            Assert.That(output.Time == null);
         }
 
         [TestCase(TestEnum.One, "1")]
@@ -120,7 +124,7 @@ namespace CryptoExchange.Net.UnitTests
         public void TestEnumConverterNullableGetStringTests(TestEnum? value, string expected)
         {
             var output = EnumConverter.GetString(value);
-            Assert.AreEqual(output, expected);
+            Assert.That(output == expected);
         }
 
         [TestCase(TestEnum.One, "1")]
@@ -130,7 +134,7 @@ namespace CryptoExchange.Net.UnitTests
         public void TestEnumConverterGetStringTests(TestEnum value, string expected)
         {
             var output = EnumConverter.GetString(value);
-            Assert.AreEqual(output, expected);
+            Assert.That(output == expected);
         }
 
         [TestCase("1", TestEnum.One)]
@@ -145,7 +149,7 @@ namespace CryptoExchange.Net.UnitTests
         {
             var val = value == null ? "null" : $"\"{value}\"";
             var output = JsonConvert.DeserializeObject<EnumObject>($"{{ \"Value\": {val} }}");
-            Assert.AreEqual(output.Value, expected);
+            Assert.That(output.Value == expected);
         }
 
         [TestCase("1", TestEnum.One)]
@@ -160,7 +164,45 @@ namespace CryptoExchange.Net.UnitTests
         {
             var val = value == null ? "null" : $"\"{value}\"";
             var output = JsonConvert.DeserializeObject<NotNullableEnumObject>($"{{ \"Value\": {val} }}");
-            Assert.AreEqual(output.Value, expected);
+            Assert.That(output.Value == expected);
+        }
+
+        [TestCase("1", true)]
+        [TestCase("true", true)]
+        [TestCase("yes", true)]
+        [TestCase("y", true)]
+        [TestCase("on", true)]
+        [TestCase("-1", false)]
+        [TestCase("0", false)]
+        [TestCase("n", false)]
+        [TestCase("no", false)]
+        [TestCase("false", false)]
+        [TestCase("off", false)]
+        [TestCase("", null)]
+        public void TestBoolConverter(string value, bool? expected)
+        {
+            var val = value == null ? "null" : $"\"{value}\"";
+            var output = JsonConvert.DeserializeObject<BoolObject>($"{{ \"Value\": {val} }}");
+            Assert.That(output.Value == expected);
+        }
+
+        [TestCase("1", true)]
+        [TestCase("true", true)]
+        [TestCase("yes", true)]
+        [TestCase("y", true)]
+        [TestCase("on", true)]
+        [TestCase("-1", false)]
+        [TestCase("0", false)]
+        [TestCase("n", false)]
+        [TestCase("no", false)]
+        [TestCase("false", false)]
+        [TestCase("off", false)]
+        [TestCase("", false)]
+        public void TestBoolConverterNotNullable(string value, bool expected)
+        {
+            var val = value == null ? "null" : $"\"{value}\"";
+            var output = JsonConvert.DeserializeObject<NotNullableBoolObject>($"{{ \"Value\": {val} }}");
+            Assert.That(output.Value == expected);
         }
     }
 
@@ -180,6 +222,18 @@ namespace CryptoExchange.Net.UnitTests
         public TestEnum Value { get; set; }
     }
 
+    public class BoolObject
+    {
+        [JsonConverter(typeof(BoolConverter))]
+        public bool? Value { get; set; }
+    }
+
+    public class NotNullableBoolObject
+    {
+        [JsonConverter(typeof(BoolConverter))]
+        public bool Value { get; set; }
+    }
+
     [JsonConverter(typeof(EnumConverter))]
     public enum TestEnum
     {

CryptoExchange.Net.UnitTests/OptionsTests.cs

@@ -4,6 +4,7 @@ using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.UnitTests.TestImplementations;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -49,9 +50,9 @@ namespace CryptoExchange.Net.UnitTests
             };
 
             // assert
-            Assert.AreEqual(options.ReceiveWindow, TimeSpan.FromSeconds(10));
-            Assert.AreEqual(options.ApiCredentials.Key.GetString(), "123");
-            Assert.AreEqual(options.ApiCredentials.Secret.GetString(), "456");
+            Assert.That(options.ReceiveWindow == TimeSpan.FromSeconds(10));
+            Assert.That(options.ApiCredentials.Key.GetString() == "123");
+            Assert.That(options.ApiCredentials.Secret.GetString() == "456");
         }
 
         [Test]
@@ -63,10 +64,10 @@ namespace CryptoExchange.Net.UnitTests
             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.Api2Options.ApiCredentials.Key.GetString(), "789");
-            Assert.AreEqual(options.Api2Options.ApiCredentials.Secret.GetString(), "101");
+            Assert.That(options.Api1Options.ApiCredentials.Key.GetString() == "123");
+            Assert.That(options.Api1Options.ApiCredentials.Secret.GetString() == "456");
+            Assert.That(options.Api2Options.ApiCredentials.Key.GetString() == "789");
+            Assert.That(options.Api2Options.ApiCredentials.Secret.GetString() == "101");
         }
 
         [Test]
@@ -79,10 +80,10 @@ namespace CryptoExchange.Net.UnitTests
 
             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");
+            Assert.That(authProvider1.GetKey() == "111");
+            Assert.That(authProvider1.GetSecret() == "222");
+            Assert.That(authProvider2.GetKey() == "333");
+            Assert.That(authProvider2.GetSecret() == "444");
         }
 
         [Test]
@@ -95,10 +96,10 @@ namespace CryptoExchange.Net.UnitTests
 
             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");
+            Assert.That(authProvider1.GetKey() == "111");
+            Assert.That(authProvider1.GetSecret() == "222");
+            Assert.That(authProvider2.GetKey() == "123");
+            Assert.That(authProvider2.GetSecret() == "456");
         }
 
         [Test]
@@ -115,11 +116,11 @@ namespace CryptoExchange.Net.UnitTests
 
             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");
+            Assert.That(authProvider1.GetKey() == "333");
+            Assert.That(authProvider1.GetSecret() == "444");
+            Assert.That(authProvider2.GetKey() == "123");
+            Assert.That(authProvider2.GetSecret() == "456");
+            Assert.That(client.Api2.BaseAddress == "https://localhost:123");
         }
     }
 

CryptoExchange.Net.UnitTests/RestClientTests.cs

@@ -12,6 +12,12 @@ using Microsoft.Extensions.Logging;
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.Threading;
+using NUnit.Framework.Legacy;
+using CryptoExchange.Net.RateLimiting;
+using System.Net;
+using CryptoExchange.Net.RateLimiting.Guards;
+using CryptoExchange.Net.RateLimiting.Filters;
+using CryptoExchange.Net.RateLimiting.Interfaces;
 
 namespace CryptoExchange.Net.UnitTests
 {
@@ -30,8 +36,8 @@ namespace CryptoExchange.Net.UnitTests
             var result = client.Api1.Request<TestObject>().Result;
 
             // assert
-            Assert.IsTrue(result.Success);
-            Assert.IsTrue(TestHelpers.AreEqual(expected, result.Data));
+            Assert.That(result.Success);
+            Assert.That(TestHelpers.AreEqual(expected, result.Data));
         }
 
         [TestCase]
@@ -45,8 +51,8 @@ namespace CryptoExchange.Net.UnitTests
             var result = client.Api1.Request<TestObject>().Result;
 
             // assert
-            Assert.IsFalse(result.Success);
-            Assert.IsTrue(result.Error != null);
+            ClassicAssert.IsFalse(result.Success);
+            Assert.That(result.Error != null);
         }
 
         [TestCase]
@@ -60,8 +66,8 @@ namespace CryptoExchange.Net.UnitTests
             var result = await client.Api1.Request<TestObject>();
 
             // assert
-            Assert.IsFalse(result.Success);
-            Assert.IsTrue(result.Error != null);
+            ClassicAssert.IsFalse(result.Success);
+            Assert.That(result.Error != null);
         }
 
         [TestCase]
@@ -75,11 +81,11 @@ namespace CryptoExchange.Net.UnitTests
             var result = await client.Api1.Request<TestObject>();
 
             // assert
-            Assert.IsFalse(result.Success);
-            Assert.IsTrue(result.Error != null);
-            Assert.IsTrue(result.Error is ServerError);
-            Assert.IsTrue(result.Error.Message.Contains("Invalid request"));
-            Assert.IsTrue(result.Error.Message.Contains("123"));
+            ClassicAssert.IsFalse(result.Success);
+            Assert.That(result.Error != null);
+            Assert.That(result.Error is ServerError);
+            Assert.That(result.Error.Message.Contains("Invalid request"));
+            Assert.That(result.Error.Message.Contains("123"));
         }
 
         [TestCase]
@@ -93,11 +99,11 @@ namespace CryptoExchange.Net.UnitTests
             var result = await client.Api2.Request<TestObject>();
 
             // assert
-            Assert.IsFalse(result.Success);
-            Assert.IsTrue(result.Error != null);
-            Assert.IsTrue(result.Error is ServerError);
-            Assert.IsTrue(result.Error.Code == 123);
-            Assert.IsTrue(result.Error.Message == "Invalid request");
+            ClassicAssert.IsFalse(result.Success);
+            Assert.That(result.Error != null);
+            Assert.That(result.Error is ServerError);
+            Assert.That(result.Error.Code == 123);
+            Assert.That(result.Error.Message == "Invalid request");
         }
 
         [TestCase]
@@ -106,15 +112,15 @@ namespace CryptoExchange.Net.UnitTests
             // arrange
             // act
             var options = new TestClientOptions();
-            options.Api1Options.RateLimiters = new List<IRateLimiter> { new RateLimiter() };
-            options.Api1Options.RateLimitingBehaviour = RateLimitingBehaviour.Fail;
+            options.Api1Options.TimestampRecalculationInterval = TimeSpan.FromMinutes(10);
+            options.Api1Options.OutputOriginalData = true;
             options.RequestTimeout = TimeSpan.FromMinutes(1);
             var client = new TestBaseClient(options);
 
             // assert
-            Assert.IsTrue(((TestClientOptions)client.ClientOptions).Api1Options.RateLimiters.Count == 1);
-            Assert.IsTrue(((TestClientOptions)client.ClientOptions).Api1Options.RateLimitingBehaviour == RateLimitingBehaviour.Fail);
-            Assert.IsTrue(((TestClientOptions)client.ClientOptions).RequestTimeout == TimeSpan.FromMinutes(1));
+            Assert.That(((TestClientOptions)client.ClientOptions).Api1Options.TimestampRecalculationInterval == TimeSpan.FromMinutes(10));
+            Assert.That(((TestClientOptions)client.ClientOptions).Api1Options.OutputOriginalData == true);
+            Assert.That(((TestClientOptions)client.ClientOptions).RequestTimeout == TimeSpan.FromMinutes(1));
         }
 
         [TestCase("GET", HttpMethodParameterPosition.InUri)] // No need to test InBody for GET since thats not valid
@@ -145,13 +151,13 @@ namespace CryptoExchange.Net.UnitTests
             });
 
             // assert
-            Assert.AreEqual(request.Method, new HttpMethod(method));
-            Assert.AreEqual(request.Content?.Contains("TestParam1") == true, pos == HttpMethodParameterPosition.InBody);
-            Assert.AreEqual(request.Uri.ToString().Contains("TestParam1"), pos == HttpMethodParameterPosition.InUri);
-            Assert.AreEqual(request.Content?.Contains("TestParam2") == true, pos == HttpMethodParameterPosition.InBody);
-            Assert.AreEqual(request.Uri.ToString().Contains("TestParam2"), pos == HttpMethodParameterPosition.InUri);
-            Assert.AreEqual(request.GetHeaders().First().Key, "TestHeader");
-            Assert.IsTrue(request.GetHeaders().First().Value.Contains("123"));
+            Assert.That(request.Method == new HttpMethod(method));
+            Assert.That((request.Content?.Contains("TestParam1") == true) == (pos == HttpMethodParameterPosition.InBody));
+            Assert.That((request.Uri.ToString().Contains("TestParam1")) == (pos == HttpMethodParameterPosition.InUri));
+            Assert.That((request.Content?.Contains("TestParam2") == true) == (pos == HttpMethodParameterPosition.InBody));
+            Assert.That((request.Uri.ToString().Contains("TestParam2")) == (pos == HttpMethodParameterPosition.InUri));
+            Assert.That(request.GetHeaders().First().Key == "TestHeader");
+            Assert.That(request.GetHeaders().First().Value.Contains("123"));
         }
 
 
@@ -161,18 +167,22 @@ namespace CryptoExchange.Net.UnitTests
         [TestCase(1, 2)]
         public async Task PartialEndpointRateLimiterBasics(int requests, double perSeconds)
         {
-            var rateLimiter = new RateLimiter();
-            rateLimiter.AddPartialEndpointLimit("/sapi/", requests, TimeSpan.FromSeconds(perSeconds));
+            var rateLimiter = new RateLimitGate("Test");
+            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, new PathStartFilter("/sapi/"), requests, TimeSpan.FromSeconds(perSeconds), RateLimitWindowType.Fixed));
+
+            var triggered = false;
+            rateLimiter.RateLimitTriggered += (x) => { triggered = true; };
+            var requestDefinition = new RequestDefinition("/sapi/v1/system/status", HttpMethod.Get);
 
             for (var i = 0; i < requests + 1; i++)
             {
-                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);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);             
+                Assert.That(i == requests? triggered : !triggered);
             }
-
+            triggered = false;
             await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
-            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);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1,  RateLimitingBehaviour.Wait, default);
+            Assert.That(!triggered);
         }
 
         [TestCase("/sapi/test1", true)]
@@ -182,29 +192,40 @@ namespace CryptoExchange.Net.UnitTests
         [TestCase("/sapi/", true)]
         public async Task PartialEndpointRateLimiterEndpoints(string endpoint, bool expectLimiting)
         {
-            var rateLimiter = new RateLimiter();
-            rateLimiter.AddPartialEndpointLimit("/sapi/", 1, TimeSpan.FromSeconds(0.1));
+            var rateLimiter = new RateLimitGate("Test");
+            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, new PathStartFilter("/sapi/"), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
 
+            var requestDefinition = new RequestDefinition(endpoint, HttpMethod.Get);
+
+            RateLimitEvent evnt = null;
+            rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
             for (var i = 0; i < 2; i++)
             {
-                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);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+                bool expected = i == 1 ? (expectLimiting ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
+                Assert.That(expected);
             }
         }
+
         [TestCase("/sapi/", "/sapi/", true)]
         [TestCase("/sapi/test", "/sapi/test", true)]
         [TestCase("/sapi/test", "/sapi/test123", false)]
         [TestCase("/sapi/test", "/sapi/", false)]
         public async Task PartialEndpointRateLimiterEndpoints(string endpoint1, string endpoint2, bool expectLimiting)
         {
-            var rateLimiter = new RateLimiter();
-            rateLimiter.AddPartialEndpointLimit("/sapi/", 1, TimeSpan.FromSeconds(0.1), countPerEndpoint: true);
+            var rateLimiter = new RateLimitGate("Test");
+            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerEndpoint, new PathStartFilter("/sapi/"), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
 
-            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);            
+            var requestDefinition1 = new RequestDefinition(endpoint1, HttpMethod.Get);
+            var requestDefinition2 = new RequestDefinition(endpoint2, HttpMethod.Get);
+
+            RateLimitEvent evnt = null;
+            rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
+
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+            Assert.That(evnt == null);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+            Assert.That(expectLimiting ? evnt != null : evnt == null);
         }
 
         [TestCase(1, 0.1)]
@@ -213,18 +234,22 @@ namespace CryptoExchange.Net.UnitTests
         [TestCase(1, 2)]
         public async Task EndpointRateLimiterBasics(int requests, double perSeconds)
         {
-            var rateLimiter = new RateLimiter();
-            rateLimiter.AddEndpointLimit("/sapi/test", requests, TimeSpan.FromSeconds(perSeconds));
+            var rateLimiter = new RateLimitGate("Test");
+            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerEndpoint, new PathStartFilter("/sapi/test"), requests, TimeSpan.FromSeconds(perSeconds), RateLimitWindowType.Fixed));
+
+            bool triggered = false;
+            rateLimiter.RateLimitTriggered += (x) => { triggered = true; };
+            var requestDefinition = new RequestDefinition("/sapi/test", HttpMethod.Get);
 
             for (var i = 0; i < requests + 1; i++)
             {
-                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);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+                Assert.That(i == requests ? triggered : !triggered);
             }
-
+            triggered = false;
             await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
-            var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), "/sapi/test", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
-            Assert.IsTrue(result2.Data == 0);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+            Assert.That(!triggered);
         }
 
         [TestCase("/", false)]
@@ -232,14 +257,18 @@ namespace CryptoExchange.Net.UnitTests
         [TestCase("/sapi/test/123", false)]
         public async Task EndpointRateLimiterEndpoints(string endpoint, bool expectLimited)
         {
-            var rateLimiter = new RateLimiter();
-            rateLimiter.AddEndpointLimit("/sapi/test", 1, TimeSpan.FromSeconds(0.1));
+            var rateLimiter = new RateLimitGate("Test");
+            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerEndpoint, new ExactPathFilter("/sapi/test"), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
+            
+            var requestDefinition = new RequestDefinition(endpoint, HttpMethod.Get);
 
+            RateLimitEvent evnt = null;
+            rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
             for (var i = 0; i < 2; i++)
             {
-                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);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+                bool expected = i == 1 ? (expectLimited ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
+                Assert.That(expected);
             }
         }
 
@@ -249,47 +278,41 @@ namespace CryptoExchange.Net.UnitTests
         [TestCase("/sapi/test23", false)]
         public async Task EndpointRateLimiterMultipleEndpoints(string endpoint, bool expectLimited)
         {
-            var rateLimiter = new RateLimiter();
-            rateLimiter.AddEndpointLimit(new[] { "/sapi/test", "/sapi/test2" }, 1, TimeSpan.FromSeconds(0.1));
+            var rateLimiter = new RateLimitGate("Test");
+            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerEndpoint, new ExactPathsFilter(new[] { "/sapi/test", "/sapi/test2" }), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
+            var requestDefinition = new RequestDefinition(endpoint, HttpMethod.Get);
 
+            RateLimitEvent evnt = null;
+            rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
             for (var i = 0; i < 2; i++)
             {
-                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);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+                bool expected = i == 1 ? (expectLimited ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
+                Assert.That(expected);
             }
         }
 
-        [TestCase("123", "123", "/sapi/test", "/sapi/test", true, true, true, true)]
-        [TestCase("123", "456", "/sapi/test", "/sapi/test", true, true, true, false)]
-        [TestCase("123", "123", "/sapi/test", "/sapi/test2", true, true, true, true)]
-        [TestCase("123", "123", "/sapi/test2", "/sapi/test", true, true, true, true)]
-        [TestCase("123", "123", "/sapi/test", "/sapi/test", true, false, true, false)]
-        [TestCase("123", "123", "/sapi/test", "/sapi/test", false, true, true, false)]
-        [TestCase("123", "123", "/sapi/test", "/sapi/test", false, false, true, false)]
-        [TestCase(null, "123", "/sapi/test", "/sapi/test", false, true, true, false)]
-        [TestCase("123", null, "/sapi/test", "/sapi/test", true, false, true, false)]
-        [TestCase(null, null, "/sapi/test", "/sapi/test", false, false, true, false)]
-
-        [TestCase("123", "123", "/sapi/test", "/sapi/test", true, true, false, true)]
-        [TestCase("123", "456", "/sapi/test", "/sapi/test", true, true, false, false)]
-        [TestCase("123", "123", "/sapi/test", "/sapi/test2", true, true, false, true)]
-        [TestCase("123", "123", "/sapi/test2", "/sapi/test", true, true, false, true)]
-        [TestCase("123", "123", "/sapi/test", "/sapi/test", true, false, false, true)]
-        [TestCase("123", "123", "/sapi/test", "/sapi/test", false, true, false, true)]
-        [TestCase("123", "123", "/sapi/test", "/sapi/test", false, false, false, true)]
-        [TestCase(null, "123", "/sapi/test", "/sapi/test", false, true, false, false)]
-        [TestCase("123", null, "/sapi/test", "/sapi/test", true, false, false, false)]
-        [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)
+        [TestCase("123", "123", "/sapi/test", "/sapi/test", true)]
+        [TestCase("123", "456", "/sapi/test", "/sapi/test", false)]
+        [TestCase("123", "123", "/sapi/test", "/sapi/test2", true)]
+        [TestCase("123", "123", "/sapi/test2", "/sapi/test", true)]
+        [TestCase(null, "123", "/sapi/test", "/sapi/test", false)]
+        [TestCase("123", null, "/sapi/test", "/sapi/test", false)]
+        [TestCase(null, null, "/sapi/test", "/sapi/test", false)]
+        public async Task ApiKeyRateLimiterBasics(string key1, string key2, string endpoint1, string endpoint2, bool expectLimited)
         {
-            var rateLimiter = new RateLimiter();
-            rateLimiter.AddApiKeyLimit(1, TimeSpan.FromSeconds(0.1), onlyForSignedRequests, false);
+            var rateLimiter = new RateLimitGate("Test");
+            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerApiKey, new AuthenticatedEndpointFilter(true), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
+            var requestDefinition1 = new RequestDefinition(endpoint1, HttpMethod.Get) { Authenticated = key1 != null };
+            var requestDefinition2 = new RequestDefinition(endpoint2, HttpMethod.Get) { Authenticated = key2 != null };
 
-            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);            
+            RateLimitEvent evnt = null;
+            rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
+
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", key1?.ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+            Assert.That(evnt == null);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", key2?.ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+            Assert.That(expectLimited ? evnt != null : evnt == null);
         }
 
         [TestCase("/sapi/test", "/sapi/test", true)]
@@ -297,29 +320,55 @@ namespace CryptoExchange.Net.UnitTests
         [TestCase("/", "/sapi/test2", true)]
         public async Task TotalRateLimiterBasics(string endpoint1, string endpoint2, bool expectLimited)
         {
-            var rateLimiter = new RateLimiter();
-            rateLimiter.AddTotalRateLimit(1, TimeSpan.FromSeconds(0.1));
+            var rateLimiter = new RateLimitGate("Test");
+            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, Array.Empty<IGuardFilter>(), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
+            var requestDefinition1 = new RequestDefinition(endpoint1, HttpMethod.Get);
+            var requestDefinition2 = new RequestDefinition(endpoint2, HttpMethod.Get) { Authenticated = true };
 
-            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);
+            RateLimitEvent evnt = null;
+            rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
+
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+            Assert.That(evnt == null);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", null, 1, RateLimitingBehaviour.Wait, default);
+            Assert.That(expectLimited ? evnt != null : evnt == null);
         }
 
-        [TestCase("/sapi/test", true, true, true, false)]
-        [TestCase("/sapi/test", false, true, true, false)]
-        [TestCase("/sapi/test", false, true, false, true)]
-        [TestCase("/sapi/test", true, true, false, true)]
-        public async Task ApiKeyRateLimiterIgnores_TotalRateLimiter_IfSet(string endpoint, bool signed1, bool signed2, bool ignoreTotal, bool expectLimited)
+        [TestCase("https://test.com", "/sapi/test", "https://test.com", "/sapi/test", true)]
+        [TestCase("https://test2.com", "/sapi/test", "https://test.com", "/sapi/test", false)]
+        [TestCase("https://test.com", "/sapi/test", "https://test2.com", "/sapi/test", false)]
+        [TestCase("https://test.com", "/sapi/test", "https://test.com", "/sapi/test2", true)]
+        public async Task HostRateLimiterBasics(string host1, string endpoint1, string host2, string endpoint2, bool expectLimited)
         {
-            var rateLimiter = new RateLimiter();
-            rateLimiter.AddApiKeyLimit(100, TimeSpan.FromSeconds(0.1), true, ignoreTotal);
-            rateLimiter.AddTotalRateLimit(1, TimeSpan.FromSeconds(0.1));
+            var rateLimiter = new RateLimitGate("Test");
+            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, new HostFilter("https://test.com"), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
+            var requestDefinition1 = new RequestDefinition(endpoint1, HttpMethod.Get);
+            var requestDefinition2 = new RequestDefinition(endpoint2, HttpMethod.Get) { Authenticated = true };
 
-            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);
+            RateLimitEvent evnt = null;
+            rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
+
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host1, "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+            Assert.That(evnt == null);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host2, "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+            Assert.That(expectLimited ? evnt != null : evnt == null);
+        }
+
+        [TestCase("https://test.com", "https://test.com", true)]
+        [TestCase("https://test2.com", "https://test.com", false)]
+        [TestCase("https://test.com", "https://test2.com", false)]
+        public async Task ConnectionRateLimiterBasics(string host1, string host2, bool expectLimited)
+        {
+            var rateLimiter = new RateLimitGate("Test");
+            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, new LimitItemTypeFilter(RateLimitItemType.Connection), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
+
+            RateLimitEvent evnt = null;
+            rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
+
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host1, "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+            Assert.That(evnt == null);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host2, "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
+            Assert.That(expectLimited ? evnt != null : evnt == null);
         }
     }
 }

CryptoExchange.Net.UnitTests/SocketClientTests.cs

@@ -1,11 +1,17 @@
 using System;
+using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Sockets;
 using CryptoExchange.Net.Sockets;
 using CryptoExchange.Net.UnitTests.TestImplementations;
+using CryptoExchange.Net.UnitTests.TestImplementations.Sockets;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json.Linq;
+using Moq;
+using Newtonsoft.Json;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace CryptoExchange.Net.UnitTests
 {
@@ -23,10 +29,9 @@ namespace CryptoExchange.Net.UnitTests
                 options.SubOptions.MaxSocketConnections = 1;
             });
 
-
             //assert
-            Assert.NotNull(client.SubClient.ApiOptions.ApiCredentials);
-            Assert.AreEqual(1, client.SubClient.ApiOptions.MaxSocketConnections);
+            ClassicAssert.NotNull(client.SubClient.ApiOptions.ApiCredentials);
+            Assert.That(1 == client.SubClient.ApiOptions.MaxSocketConnections);
         }
 
         [TestCase(true)]
@@ -42,7 +47,7 @@ namespace CryptoExchange.Net.UnitTests
             var connectResult = client.SubClient.ConnectSocketSub(new SocketConnection(new TraceLogger(), client.SubClient, socket, null));
 
             //assert
-            Assert.IsTrue(connectResult.Success == canConnect);
+            Assert.That(connectResult.Success == canConnect);
         }
 
         [TestCase]
@@ -58,20 +63,24 @@ namespace CryptoExchange.Net.UnitTests
             socket.DisconnectTime = DateTime.UtcNow;
             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, false, (messageEvent) =>
-            {
-                result = messageEvent.JsonData;
-                rstEvent.Set();
-            }));
+            Dictionary<string, string> result = null;
+
             client.SubClient.ConnectSocketSub(sub);
 
+            var subObj = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) =>
+            {
+                result = messageEvent.Data;
+                rstEvent.Set();
+            });
+            subObj.HandleUpdatesBeforeConfirmation = true;
+            sub.AddSubscription(subObj);
+
             // act
-            socket.InvokeMessage("{\"property\": 123}");
+            socket.InvokeMessage("{\"property\": \"123\", \"topic\": \"topic\"}");
             rstEvent.WaitOne(1000);
 
             // assert
-            Assert.IsTrue((int)result["property"] == 123);
+            Assert.That(result["property"] == "123");
         }
 
         [TestCase(false)]
@@ -79,7 +88,8 @@ namespace CryptoExchange.Net.UnitTests
         public void SocketMessages_Should_ContainOriginalDataIfEnabled(bool enabled)
         {
             // arrange
-            var client = new TestSocketClient(options => {
+            var client = new TestSocketClient(options =>
+            {
                 options.ReconnectInterval = TimeSpan.Zero;
                 options.SubOptions.OutputOriginalData = enabled;
             });
@@ -90,41 +100,47 @@ namespace CryptoExchange.Net.UnitTests
             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, false, (messageEvent) =>
+
+            client.SubClient.ConnectSocketSub(sub);
+            var subObj = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) =>
             {
                 original = messageEvent.OriginalData;
                 rstEvent.Set();
-            }));
-            client.SubClient.ConnectSocketSub(sub);
+            });
+            subObj.HandleUpdatesBeforeConfirmation = true;
+            sub.AddSubscription(subObj);
+            var msgToSend = JsonConvert.SerializeObject(new { topic = "topic", property = 123 });
 
             // act
-            socket.InvokeMessage("{\"property\": 123}");
+            socket.InvokeMessage(msgToSend);
             rstEvent.WaitOne(1000);
 
             // assert
-            Assert.IsTrue(original == (enabled ? "{\"property\": 123}" : null));
+            Assert.That(original == (enabled ? msgToSend : null));
         }
 
         [TestCase()]
         public void UnsubscribingStream_Should_CloseTheSocket()
         {
             // arrange
-            var client = new TestSocketClient(options => {
+            var client = new TestSocketClient(options =>
+            {
                 options.ReconnectInterval = TimeSpan.Zero;
-            }); 
+            });
             var socket = client.CreateSocket();
             socket.CanConnect = true;
             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);
+
+            var subscription = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) => { });
+            var ups = new UpdateSubscription(sub, subscription);
+            sub.AddSubscription(subscription);
 
             // act
             client.UnsubscribeAsync(ups).Wait();
 
             // assert
-            Assert.IsTrue(socket.Connected == false);
+            Assert.That(socket.Connected == false);
         }
 
         [TestCase()]
@@ -140,19 +156,20 @@ namespace CryptoExchange.Net.UnitTests
             var sub2 = new SocketConnection(new TraceLogger(), client.SubClient, socket2, null);
             client.SubClient.ConnectSocketSub(sub1);
             client.SubClient.ConnectSocketSub(sub2);
-            var us1 = SocketSubscription.CreateForIdentifier(10, "Test1", true, false, (e) => { });
-            var us2 = SocketSubscription.CreateForIdentifier(11, "Test2", true, false, (e) => { });
-            sub1.AddSubscription(us1);
-            sub2.AddSubscription(us2);
-            var ups1 = new UpdateSubscription(sub1, us1);
-            var ups2 = new UpdateSubscription(sub2, us2);
+            var subscription1 = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) => { });
+            var subscription2 = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) => { });
+
+            sub1.AddSubscription(subscription1);
+            sub2.AddSubscription(subscription2);
+            var ups1 = new UpdateSubscription(sub1, subscription1);
+            var ups2 = new UpdateSubscription(sub2, subscription2);
 
             // act
             client.UnsubscribeAllAsync().Wait();
 
             // assert
-            Assert.IsTrue(socket1.Connected == false);
-            Assert.IsTrue(socket2.Connected == false);
+            Assert.That(socket1.Connected == false);
+            Assert.That(socket2.Connected == false);
         }
 
         [TestCase()]
@@ -168,7 +185,53 @@ namespace CryptoExchange.Net.UnitTests
             var connectResult = client.SubClient.ConnectSocketSub(sub1);
 
             // assert
-            Assert.IsFalse(connectResult.Success);
+            ClassicAssert.IsFalse(connectResult.Success);
+        }
+
+        [TestCase()]
+        public async Task ErrorResponse_ShouldNot_ConfirmSubscription()
+        {
+            // arrange
+            var channel = "trade_btcusd";
+            var client = new TestSocketClient(opt =>
+            {
+                opt.OutputOriginalData = true;
+                opt.SocketSubscriptionsCombineTarget = 1;
+            });
+            var socket = client.CreateSocket();
+            socket.CanConnect = true;
+            client.SubClient.ConnectSocketSub(new SocketConnection(new TraceLogger(), client.SubClient, socket, "https://test.test"));
+
+            // act
+            var sub = client.SubClient.SubscribeToSomethingAsync(channel, onUpdate => {}, ct: default);
+            socket.InvokeMessage(JsonConvert.SerializeObject(new { channel, status = "error" }));
+            await sub;
+
+            // assert
+            ClassicAssert.IsFalse(client.SubClient.TestSubscription.Confirmed);
+        }
+
+        [TestCase()]
+        public async Task SuccessResponse_Should_ConfirmSubscription()
+        {
+            // arrange
+            var channel = "trade_btcusd";
+            var client = new TestSocketClient(opt =>
+            {
+                opt.OutputOriginalData = true;
+                opt.SocketSubscriptionsCombineTarget = 1;
+            });
+            var socket = client.CreateSocket();
+            socket.CanConnect = true;
+            client.SubClient.ConnectSocketSub(new SocketConnection(new TraceLogger(), client.SubClient, socket, "https://test.test"));
+
+            // act
+            var sub = client.SubClient.SubscribeToSomethingAsync(channel, onUpdate => {}, ct: default);
+            socket.InvokeMessage(JsonConvert.SerializeObject(new { channel, status = "confirmed" }));
+            await sub;
+
+            // assert
+            Assert.That(client.SubClient.TestSubscription.Confirmed);
         }
     }
 }

CryptoExchange.Net.UnitTests/SymbolOrderBookTests.cs

@@ -5,22 +5,23 @@ using System.Threading.Tasks;
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.Objects.Sockets;
 using CryptoExchange.Net.OrderBook;
-using CryptoExchange.Net.Sockets;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace CryptoExchange.Net.UnitTests
 {
     [TestFixture]
     public class SymbolOrderBookTests
     {
-        private static OrderBookOptions defaultOrderBookOptions = new OrderBookOptions();
+        private static readonly OrderBookOptions _defaultOrderBookOptions = new OrderBookOptions();
 
         private class TestableSymbolOrderBook : SymbolOrderBook
         {
-            public TestableSymbolOrderBook() : base(null, "Test", "BTC/USD")
+            public TestableSymbolOrderBook() : base(null, "Test", "Test", "BTC/USD")
             {
-                Initialize(defaultOrderBookOptions);
+                Initialize(_defaultOrderBookOptions);
             }
 
 
@@ -56,31 +57,31 @@ namespace CryptoExchange.Net.UnitTests
         public void GivenEmptyBidList_WhenBestBid_ThenEmptySymbolOrderBookEntry()
         {
             var symbolOrderBook = new TestableSymbolOrderBook();
-            Assert.IsNotNull(symbolOrderBook.BestBid);
-            Assert.AreEqual(0m, symbolOrderBook.BestBid.Price);
-            Assert.AreEqual(0m, symbolOrderBook.BestAsk.Quantity);
+            ClassicAssert.IsNotNull(symbolOrderBook.BestBid);
+            Assert.That(0m == symbolOrderBook.BestBid.Price);
+            Assert.That(0m == symbolOrderBook.BestAsk.Quantity);
         }
 
         [TestCase]
         public void GivenEmptyAskList_WhenBestAsk_ThenEmptySymbolOrderBookEntry()
         {
             var symbolOrderBook = new TestableSymbolOrderBook();
-            Assert.IsNotNull(symbolOrderBook.BestBid);
-            Assert.AreEqual(0m, symbolOrderBook.BestBid.Price);
-            Assert.AreEqual(0m, symbolOrderBook.BestAsk.Quantity);
+            ClassicAssert.IsNotNull(symbolOrderBook.BestBid);
+            Assert.That(0m == symbolOrderBook.BestBid.Price);
+            Assert.That(0m == symbolOrderBook.BestAsk.Quantity);
         }
 
         [TestCase]
         public void GivenEmptyBidAndAskList_WhenBestOffers_ThenEmptySymbolOrderBookEntries()
         {
             var symbolOrderBook = new TestableSymbolOrderBook();
-            Assert.IsNotNull(symbolOrderBook.BestOffers);
-            Assert.IsNotNull(symbolOrderBook.BestOffers.Bid);
-            Assert.IsNotNull(symbolOrderBook.BestOffers.Ask);
-            Assert.AreEqual(0m, symbolOrderBook.BestOffers.Bid.Price);
-            Assert.AreEqual(0m, symbolOrderBook.BestOffers.Bid.Quantity);
-            Assert.AreEqual(0m, symbolOrderBook.BestOffers.Ask.Price);
-            Assert.AreEqual(0m, symbolOrderBook.BestOffers.Ask.Quantity);
+            ClassicAssert.IsNotNull(symbolOrderBook.BestOffers);
+            ClassicAssert.IsNotNull(symbolOrderBook.BestOffers.Bid);
+            ClassicAssert.IsNotNull(symbolOrderBook.BestOffers.Ask);
+            Assert.That(0m == symbolOrderBook.BestOffers.Bid.Price);
+            Assert.That(0m == symbolOrderBook.BestOffers.Bid.Quantity);
+            Assert.That(0m == symbolOrderBook.BestOffers.Ask.Price);
+            Assert.That(0m == symbolOrderBook.BestOffers.Ask.Quantity);
         }
 
         [TestCase]
@@ -103,12 +104,12 @@ namespace CryptoExchange.Net.UnitTests
             var resultBids2 = orderbook.CalculateAverageFillPrice(1.5m, OrderBookEntryType.Bid);
             var resultAsks2 = orderbook.CalculateAverageFillPrice(1.5m, OrderBookEntryType.Ask);
 
-            Assert.True(resultBids.Success);
-            Assert.True(resultAsks.Success);
-            Assert.AreEqual(1.05m, resultBids.Data);
-            Assert.AreEqual(1.25m, resultAsks.Data);
-            Assert.AreEqual(1.06666667m, resultBids2.Data);
-            Assert.AreEqual(1.23333333m, resultAsks2.Data);
+            Assert.That(resultBids.Success);
+            Assert.That(resultAsks.Success);
+            Assert.That(1.05m == resultBids.Data);
+            Assert.That(1.25m == resultAsks.Data);
+            Assert.That(1.06666667m == resultBids2.Data);
+            Assert.That(1.23333333m == resultAsks2.Data);
         }
 
         [TestCase]
@@ -131,12 +132,12 @@ namespace CryptoExchange.Net.UnitTests
             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);
+            Assert.That(resultBids.Success);
+            Assert.That(resultAsks.Success);
+            Assert.That(1.9m == resultBids.Data);
+            Assert.That(1.61538462m == resultAsks.Data);
+            Assert.That(1.4m == resultBids2.Data);
+            Assert.That(1.23076923m == resultAsks2.Data);
         }
     }
 }

CryptoExchange.Net.UnitTests/SystemTextJsonConverterTests.cs

@@ -0,0 +1,235 @@
+using CryptoExchange.Net.Attributes;
+using CryptoExchange.Net.Converters.SystemTextJson;
+using System.Text.Json;
+using NUnit.Framework;
+using System;
+using System.Text.Json.Serialization;
+using NUnit.Framework.Legacy;
+
+namespace CryptoExchange.Net.UnitTests
+{
+    [TestFixture()]
+    public class SystemTextJsonConverterTests
+    {
+        [TestCase("2021-05-12")]
+        [TestCase("20210512")]
+        [TestCase("210512")]
+        [TestCase("1620777600.000")]
+        [TestCase("1620777600000")]
+        [TestCase("2021-05-12T00:00:00.000Z")]
+        [TestCase("2021-05-12T00:00:00.000000000Z")]
+        [TestCase("0.000000", true)]
+        [TestCase("0", true)]
+        [TestCase("", true)]
+        [TestCase("  ", true)]
+        public void TestDateTimeConverterString(string input, bool expectNull = false)
+        {
+            var output = JsonSerializer.Deserialize<STJTimeObject>($"{{ \"time\": \"{input}\" }}");
+            Assert.That(output.Time == (expectNull ? null: new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc)));
+        }
+
+        [TestCase(1620777600.000)]
+        [TestCase(1620777600000d)]
+        public void TestDateTimeConverterDouble(double input)
+        {
+            var output = JsonSerializer.Deserialize<STJTimeObject>($"{{ \"time\": {input} }}");
+            Assert.That(output.Time == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+        }
+
+        [TestCase(1620777600)]
+        [TestCase(1620777600000)]
+        [TestCase(1620777600000000)]
+        [TestCase(1620777600000000000)]
+        [TestCase(0, true)]
+        public void TestDateTimeConverterLong(long input, bool expectNull = false)
+        {
+            var output = JsonSerializer.Deserialize<STJTimeObject>($"{{ \"time\": {input} }}");
+            Assert.That(output.Time == (expectNull ? null : new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc)));
+        }
+
+        [TestCase(1620777600)]
+        [TestCase(1620777600.000)]
+        public void TestDateTimeConverterFromSeconds(double input)
+        {
+            var output = DateTimeConverter.ConvertFromSeconds(input);
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+        }
+
+        [Test]
+        public void TestDateTimeConverterToSeconds()
+        {
+            var output = DateTimeConverter.ConvertToSeconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == 1620777600);
+        }
+
+        [TestCase(1620777600000)]
+        [TestCase(1620777600000.000)]
+        public void TestDateTimeConverterFromMilliseconds(double input)
+        {
+            var output = DateTimeConverter.ConvertFromMilliseconds(input);
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+        }
+
+        [Test]
+        public void TestDateTimeConverterToMilliseconds()
+        {
+            var output = DateTimeConverter.ConvertToMilliseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == 1620777600000);
+        }
+
+        [TestCase(1620777600000000)]
+        public void TestDateTimeConverterFromMicroseconds(long input)
+        {
+            var output = DateTimeConverter.ConvertFromMicroseconds(input);
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+        }
+
+        [Test]
+        public void TestDateTimeConverterToMicroseconds()
+        {
+            var output = DateTimeConverter.ConvertToMicroseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == 1620777600000000);
+        }
+
+        [TestCase(1620777600000000000)]
+        public void TestDateTimeConverterFromNanoseconds(long input)
+        {
+            var output = DateTimeConverter.ConvertFromNanoseconds(input);
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+        }
+
+        [Test]
+        public void TestDateTimeConverterToNanoseconds()
+        {
+            var output = DateTimeConverter.ConvertToNanoseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == 1620777600000000000);
+        }
+
+        [TestCase()]
+        public void TestDateTimeConverterNull()
+        {
+            var output = JsonSerializer.Deserialize<STJTimeObject>($"{{ \"time\": null }}");
+            Assert.That(output.Time == null);
+        }
+
+        [TestCase(TestEnum.One, "1")]
+        [TestCase(TestEnum.Two, "2")]
+        [TestCase(TestEnum.Three, "three")]
+        [TestCase(TestEnum.Four, "Four")]
+        [TestCase(null, null)]
+        public void TestEnumConverterNullableGetStringTests(TestEnum? value, string expected)
+        {
+            var output = EnumConverter.GetString(value);
+            Assert.That(output == expected);
+        }
+
+        [TestCase(TestEnum.One, "1")]
+        [TestCase(TestEnum.Two, "2")]
+        [TestCase(TestEnum.Three, "three")]
+        [TestCase(TestEnum.Four, "Four")]
+        public void TestEnumConverterGetStringTests(TestEnum value, string expected)
+        {
+            var output = EnumConverter.GetString(value);
+            Assert.That(output == expected);
+        }
+
+        [TestCase("1", TestEnum.One)]
+        [TestCase("2", TestEnum.Two)]
+        [TestCase("3", TestEnum.Three)]
+        [TestCase("three", TestEnum.Three)]
+        [TestCase("Four", TestEnum.Four)]
+        [TestCase("four", TestEnum.Four)]
+        [TestCase("Four1", null)]
+        [TestCase(null, null)]
+        public void TestEnumConverterNullableDeserializeTests(string value, TestEnum? expected)
+        {
+            var val = value == null ? "null" : $"\"{value}\"";
+            var output = JsonSerializer.Deserialize<STJEnumObject>($"{{ \"Value\": {val} }}");
+            Assert.That(output.Value == expected);
+        }
+
+        [TestCase("1", TestEnum.One)]
+        [TestCase("2", TestEnum.Two)]
+        [TestCase("3", TestEnum.Three)]
+        [TestCase("three", TestEnum.Three)]
+        [TestCase("Four", TestEnum.Four)]
+        [TestCase("four", TestEnum.Four)]
+        [TestCase("Four1", TestEnum.One)]
+        [TestCase(null, TestEnum.One)]
+        public void TestEnumConverterNotNullableDeserializeTests(string value, TestEnum? expected)
+        {
+            var val = value == null ? "null" : $"\"{value}\"";
+            var output = JsonSerializer.Deserialize<NotNullableSTJEnumObject>($"{{ \"Value\": {val} }}");
+            Assert.That(output.Value == expected);
+        }
+
+        [TestCase("1", true)]
+        [TestCase("true", true)]
+        [TestCase("yes", true)]
+        [TestCase("y", true)]
+        [TestCase("on", true)]
+        [TestCase("-1", false)]
+        [TestCase("0", false)]
+        [TestCase("n", false)]
+        [TestCase("no", false)]
+        [TestCase("false", false)]
+        [TestCase("off", false)]
+        [TestCase("", null)]
+        public void TestBoolConverter(string value, bool? expected)
+        {
+            var val = value == null ? "null" : $"\"{value}\"";
+            var output = JsonSerializer.Deserialize<STJBoolObject>($"{{ \"Value\": {val} }}");
+            Assert.That(output.Value == expected);
+        }
+
+        [TestCase("1", true)]
+        [TestCase("true", true)]
+        [TestCase("yes", true)]
+        [TestCase("y", true)]
+        [TestCase("on", true)]
+        [TestCase("-1", false)]
+        [TestCase("0", false)]
+        [TestCase("n", false)]
+        [TestCase("no", false)]
+        [TestCase("false", false)]
+        [TestCase("off", false)]
+        [TestCase("", false)]
+        public void TestBoolConverterNotNullable(string value, bool expected)
+        {
+            var val = value == null ? "null" : $"\"{value}\"";
+            var output = JsonSerializer.Deserialize<NotNullableSTJBoolObject>($"{{ \"Value\": {val} }}");
+            Assert.That(output.Value == expected);
+        }
+    }
+
+    public class STJTimeObject
+    {
+        [JsonConverter(typeof(DateTimeConverter))]
+        [JsonPropertyName("time")]
+        public DateTime? Time { get; set; }
+    }
+
+    public class STJEnumObject
+    {
+        [JsonConverter(typeof(EnumConverter))]
+        public TestEnum? Value { get; set; }
+    }
+
+    public class NotNullableSTJEnumObject
+    {
+        [JsonConverter(typeof(EnumConverter))]
+        public TestEnum Value { get; set; }
+    }
+
+    public class STJBoolObject
+    {
+        [JsonConverter(typeof(BoolConverter))]
+        public bool? Value { get; set; }
+    }
+
+    public class NotNullableSTJBoolObject
+    {
+        [JsonConverter(typeof(BoolConverter))]
+        public bool Value { get; set; }
+    }
+}

CryptoExchange.Net.UnitTests/TestImplementations/Sockets/TestChannelQuery.cs

@@ -0,0 +1,45 @@
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Sockets;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
+{
+    internal class SubResponse
+    {
+        [JsonProperty("channel")]
+        public string Channel { get; set; } = null!;
+
+        [JsonProperty("status")]
+        public string Status { get; set; } = null!;
+    }
+
+    internal class UnsubResponse
+    {
+        [JsonProperty("status")]
+        public string Status { get; set; } = null!;
+    }
+
+    internal class TestChannelQuery : Query<SubResponse>
+    {
+        public override HashSet<string> ListenerIdentifiers { get; set; }
+
+        public TestChannelQuery(string channel, string request, bool authenticated, int weight = 1) : base(request, authenticated, weight)
+        {
+            ListenerIdentifiers = new HashSet<string> { channel };
+        }
+
+        public override CallResult<SubResponse> HandleMessage(SocketConnection connection, DataEvent<SubResponse> message)
+        {
+            if (!message.Data.Status.Equals("confirmed", StringComparison.OrdinalIgnoreCase))
+            {
+                return new CallResult<SubResponse>(new ServerError(message.Data.Status));
+            }
+
+            return base.HandleMessage(connection, message);
+        }
+    }
+}

CryptoExchange.Net.UnitTests/TestImplementations/Sockets/TestQuery.cs

@@ -0,0 +1,19 @@
+using CryptoExchange.Net.Sockets;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
+{
+    internal class TestQuery : Query<object>
+    {
+        public override HashSet<string> ListenerIdentifiers { get; set; }
+
+        public TestQuery(string identifier, object request, bool authenticated, int weight = 1) : base(request, authenticated, weight)
+        {
+            ListenerIdentifiers = new HashSet<string> { identifier };
+        }
+    }
+}

CryptoExchange.Net.UnitTests/TestImplementations/Sockets/TestSubscription.cs

@@ -0,0 +1,36 @@
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Sockets;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
+{
+    internal class TestSubscription<T> : Subscription<object, object>
+    {
+        private readonly Action<DataEvent<T>> _handler;
+
+        public override HashSet<string> ListenerIdentifiers { get; set; } = new HashSet<string> { "topic" };
+
+        public TestSubscription(ILogger logger, Action<DataEvent<T>> handler) : base(logger, false)
+        {
+            _handler = handler;
+        }
+
+        public override CallResult DoHandleMessage(SocketConnection connection, DataEvent<object> message)
+        {
+            var data = (T)message.Data;
+            _handler.Invoke(message.As(data));
+            return new CallResult(null);
+        }
+
+        public override Type GetMessageType(IMessageAccessor message) => typeof(T);
+        public override Query GetSubQuery(SocketConnection connection) => new TestQuery("sub", new object(), false, 1);
+        public override Query GetUnsubQuery() => new TestQuery("unsub", new object(), false, 1);
+    }
+}

CryptoExchange.Net.UnitTests/TestImplementations/Sockets/TestSubscriptionWithResponseCheck.cs

@@ -0,0 +1,38 @@
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Sockets;
+using Microsoft.Extensions.Logging;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
+{
+    internal class TestSubscriptionWithResponseCheck<T> : Subscription<SubResponse, UnsubResponse>
+    {
+        private readonly Action<DataEvent<T>> _handler;
+        private readonly string _channel;
+
+        public override HashSet<string> ListenerIdentifiers { get; set; }
+
+        public TestSubscriptionWithResponseCheck(string channel, Action<DataEvent<T>> handler) : base(Mock.Of<ILogger>(), false)
+        {
+            ListenerIdentifiers = new HashSet<string>() { channel };
+            _handler = handler;
+            _channel = channel;
+        }
+
+        public override CallResult DoHandleMessage(SocketConnection connection, DataEvent<object> message)
+        {
+            var data = (T)message.Data;
+            _handler.Invoke(message.As(data));
+            return new CallResult(null);
+        }
+
+        public override Type GetMessageType(IMessageAccessor message) => typeof(T);
+        public override Query GetSubQuery(SocketConnection connection) => new TestChannelQuery(_channel, "subscribe", false, 1);
+        public override Query GetUnsubQuery() => new TestChannelQuery(_channel, "unsubscribe", false, 1);
+    }
+}

CryptoExchange.Net.UnitTests/TestImplementations/TestBaseClient.cs

@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Net.Http;
+using System.Text;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Authentication;
+using CryptoExchange.Net.Clients;
 using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.UnitTests.TestImplementations;
@@ -39,8 +42,20 @@ namespace CryptoExchange.Net.UnitTests
         {
         }
 
-        public CallResult<T> Deserialize<T>(string data) => Deserialize<T>(data, null, null);
+        public CallResult<T> Deserialize<T>(string data)
+        {
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(data));
+            var accessor = CreateAccessor();
+            var valid = accessor.Read(stream, true).Result;
+            if (!valid)
+                return new CallResult<T>(new ServerError(data));
+            
+            var deserializeResult = accessor.Deserialize<T>();
+            return deserializeResult;
+        }
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
         public override TimeSpan? GetTimeOffset() => null;
         public override TimeSyncInfo GetTimeSyncInfo() => null;
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials) => throw new NotImplementedException();
@@ -53,7 +68,7 @@ namespace CryptoExchange.Net.UnitTests
         {
         }
 
-        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)
+        public override void AuthenticateRequest(RestApiClient apiClient, Uri uri, HttpMethod method, Dictionary<string, object> providedParameters, bool auth, ArrayParametersSerialization arraySerialization, HttpMethodParameterPosition parameterPosition, RequestBodyFormat bodyFormat, out SortedDictionary<string, object> uriParameters, out SortedDictionary<string, object> bodyParameters, out Dictionary<string, string> headers)
         {
             bodyParameters = new SortedDictionary<string, object>();
             uriParameters = new SortedDictionary<string, object>();

CryptoExchange.Net.UnitTests/TestImplementations/TestRestClient.cs

@@ -14,6 +14,7 @@ using CryptoExchange.Net.Authentication;
 using System.Collections.Generic;
 using CryptoExchange.Net.Objects.Options;
 using Microsoft.Extensions.Logging;
+using CryptoExchange.Net.Clients;
 
 namespace CryptoExchange.Net.UnitTests.TestImplementations
 {
@@ -136,14 +137,17 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
             RequestFactory = new Mock<IRequestFactory>().Object;
         }
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
+
         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);
+            return await SendRequestAsync<T>(new Uri("http://www.test.com"), HttpMethod.Get, ct, requestWeight: 0);
         }
 
         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);
+            return await SendRequestAsync<T>(new Uri("http://www.test.com"), method, default, parameters, requestWeight: 0, additionalHeaders: headers);
         }
 
         public void SetParameterPosition(HttpMethod method, HttpMethodParameterPosition position)
@@ -177,16 +181,19 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
             RequestFactory = new Mock<IRequestFactory>().Object;
         }
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
+
         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);
+            return await SendRequestAsync<T>(new Uri("http://www.test.com"), HttpMethod.Get, ct, requestWeight: 0);
         }
 
-        protected override Error ParseErrorResponse(int httpStatusCode, IEnumerable<KeyValuePair<string, IEnumerable<string>>> responseHeaders, string data)
+        protected override Error ParseErrorResponse(int httpStatusCode, IEnumerable<KeyValuePair<string, IEnumerable<string>>> responseHeaders, IMessageAccessor accessor)
         {
-            var errorData = ValidateJson(data);
+            var errorData = accessor.Deserialize<TestError>();
 
-            return new ServerError((int)errorData.Data["errorCode"], (string)errorData.Data["errorMessage"]);
+            return new ServerError(errorData.Data.ErrorCode, errorData.Data.ErrorMessage);
         }
 
         public override TimeSpan? GetTimeOffset()
@@ -208,6 +215,12 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
         }
     }
 
+    public class TestError
+    {
+        public int ErrorCode { get; set; }
+        public string ErrorMessage { get; set; }
+    }
+
     public class ParseErrorTestRestClient: TestRestClient
     {
         public ParseErrorTestRestClient() { }

CryptoExchange.Net.UnitTests/TestImplementations/TestSocket.cs

@@ -1,4 +1,6 @@
 using System;
+using System.IO;
+using System.Net.WebSockets;
 using System.Security.Authentication;
 using System.Text;
 using System.Threading.Tasks;
@@ -12,16 +14,16 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
         public bool CanConnect { get; set; }
         public bool Connected { get; set; }
 
-        public event Action OnClose;
-
+        public event Func<Task> OnClose;
 #pragma warning disable 0067
-        public event Action OnReconnected;
-        public event Action OnReconnecting;
+        public event Func<Task> OnReconnected;
+        public event Func<Task> OnReconnecting;
+        public event Func<int, Task> OnRequestRateLimited;
 #pragma warning restore 0067
-        public event Action<int> OnRequestSent;
-        public event Action<string> OnMessage;
-        public event Action<Exception> OnError;
-        public event Action OnOpen;
+        public event Func<int, Task> OnRequestSent;
+        public event Action<WebSocketMessageType, ReadOnlyMemory<byte>> OnStreamMessage;
+        public event Func<Exception, Task> OnError;
+        public event Func<Task> OnOpen;
         public Func<Task<Uri>> GetReconnectionUrl { get; set; }
 
         public int Id { get; }
@@ -61,13 +63,13 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
             }
         }
 
-        public Task<bool> ConnectAsync()
+        public Task<CallResult> ConnectAsync()
         {
             Connected = CanConnect;
             ConnectCalls++;
             if (CanConnect)
                 InvokeOpen();
-            return Task.FromResult(CanConnect);
+            return Task.FromResult(CanConnect ? new CallResult(null) : new CallResult(new CantConnectError()));
         }
 
         public void Send(int requestId, string data, int weight)
@@ -112,7 +114,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
 
         public void InvokeMessage(string data)
         {
-            OnMessage?.Invoke(data);
+            OnStreamMessage?.Invoke(WebSocketMessageType.Text, new ReadOnlyMemory<byte>(Encoding.UTF8.GetBytes(data)));
         }
 
         public void SetProxy(ApiProxy proxy)

CryptoExchange.Net.UnitTests/TestImplementations/TestSocketClient.cs

@@ -1,11 +1,16 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Authentication;
+using CryptoExchange.Net.Clients;
+using CryptoExchange.Net.Converters.MessageParsing;
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.Objects.Sockets;
 using CryptoExchange.Net.Sockets;
+using CryptoExchange.Net.UnitTests.TestImplementations.Sockets;
 using Microsoft.Extensions.Logging;
 using Moq;
 using Newtonsoft.Json.Linq;
@@ -69,12 +74,19 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
 
     public class TestSubSocketClient : SocketApiClient
     {
+        private MessagePath _channelPath = MessagePath.Get().Property("channel");
+        private MessagePath _topicPath = MessagePath.Get().Property("topic");
 
-        public TestSubSocketClient(TestSocketOptions options, SocketApiOptions apiOptions): base(new TraceLogger(), options.Environment.TestAddress, options, apiOptions)
+        public Subscription TestSubscription { get; private set; } = null;
+
+        public TestSubSocketClient(TestSocketOptions options, SocketApiOptions apiOptions) : base(new TraceLogger(), options.Environment.TestAddress, options, apiOptions)
         {
 
         }
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
+
         internal IWebsocket CreateSocketInternal(string address)
         {
             return CreateSocket(address);
@@ -83,40 +95,28 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new TestAuthProvider(credentials);
 
-        public CallResult<bool> ConnectSocketSub(SocketConnection sub)
+        public CallResult ConnectSocketSub(SocketConnection sub)
         {
             return ConnectSocketAsync(sub).Result;
         }
 
-        protected internal override bool HandleQueryResponse<T>(SocketConnection s, object request, JToken data, out CallResult<T> callResult)
+        public override string GetListenerIdentifier(IMessageAccessor message)
         {
-            throw new NotImplementedException();
+            if (!message.IsJson)
+            {
+                return "topic";
+            }
+
+            var id = message.GetValue<string>(_channelPath);
+            id ??= message.GetValue<string>(_topicPath);
+
+            return id;
         }
 
-        protected internal override bool HandleSubscriptionResponse(SocketConnection s, SocketSubscription subscription, object request, JToken message,
-            out CallResult<object> callResult)
+        public Task<CallResult<UpdateSubscription>> SubscribeToSomethingAsync(string channel, Action<DataEvent<string>> onUpdate, CancellationToken ct)
         {
-            throw new NotImplementedException();
-        }
-
-        protected internal override bool MessageMatchesHandler(SocketConnection s, JToken message, object request)
-        {
-            throw new NotImplementedException();
-        }
-
-        protected internal override bool MessageMatchesHandler(SocketConnection s, JToken message, string identifier)
-        {
-            return true;
-        }
-
-        protected internal override Task<CallResult<bool>> AuthenticateSocketAsync(SocketConnection s)
-        {
-            throw new NotImplementedException();
-        }
-
-        protected internal override Task<bool> UnsubscribeAsync(SocketConnection connection, SocketSubscription s)
-        {
-            throw new NotImplementedException();
-        }
+            TestSubscription = new TestSubscriptionWithResponseCheck<string>(channel, onUpdate);
+            return SubscribeAsync(TestSubscription, ct);
+        }        
     }
 }

CryptoExchange.Net/Authentication/ApiCredentials.cs

@@ -1,8 +1,8 @@
 using System;
 using System.IO;
 using System.Security;
-using System.Text;
-using Newtonsoft.Json.Linq;
+using CryptoExchange.Net.Converters.SystemTextJson;
+using CryptoExchange.Net.Converters.MessageParsing;
 
 namespace CryptoExchange.Net.Authentication
 {
@@ -94,38 +94,21 @@ namespace CryptoExchange.Net.Authentication
         /// <param name="identifierSecret">A key to identify the credentials for the API. For example, when set to `binanceSecret` the json data should contain a value for the property `binanceSecret`. Defaults to 'apiSecret'.</param>
         public ApiCredentials(Stream inputStream, string? identifierKey = null, string? identifierSecret = null)
         {
-            using var reader = new StreamReader(inputStream, Encoding.UTF8, false, 512, true);
-            
-            var stringData = reader.ReadToEnd();
-            var jsonData = stringData.ToJToken();
-            if(jsonData == null)
+            var accessor = new SystemTextJsonStreamMessageAccessor();
+            if (!accessor.Read(inputStream, false).Result)
                 throw new ArgumentException("Input stream not valid json data");
 
-            var key = TryGetValue(jsonData, identifierKey ?? "apiKey");
-            var secret = TryGetValue(jsonData, identifierSecret ?? "apiSecret");
-
+            var key = accessor.GetValue<string>(MessagePath.Get().Property(identifierKey ?? "apiKey"));
+            var secret = accessor.GetValue<string>(MessagePath.Get().Property(identifierSecret ?? "apiSecret"));
             if (key == null || secret == null)
                 throw new ArgumentException("apiKey or apiSecret value not found in Json credential file");
 
             Key = key.ToSecureString();
-            Secret = secret.ToSecureString();            
+            Secret = secret.ToSecureString();
 
             inputStream.Seek(0, SeekOrigin.Begin);
         }
 
-        /// <summary>
-        /// Try get the value of a key from a JToken
-        /// </summary>
-        /// <param name="data"></param>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        protected string? TryGetValue(JToken data, string key)
-        {
-            if (data[key] == null)
-                return null;
-            return (string) data[key]!;
-        }       
-
         /// <summary>
         /// Dispose
         /// </summary>

CryptoExchange.Net/Authentication/AuthenticationProvider.cs

@@ -1,4 +1,5 @@
-using CryptoExchange.Net.Converters;
+using CryptoExchange.Net.Clients;
+using CryptoExchange.Net.Converters.SystemTextJson;
 using CryptoExchange.Net.Objects;
 using System;
 using System.Collections.Generic;
@@ -47,6 +48,7 @@ namespace CryptoExchange.Net.Authentication
         /// <param name="auth">If the requests should be authenticated</param>
         /// <param name="arraySerialization">Array serialization type</param>
         /// <param name="parameterPosition">The position where the providedParameters should go</param>
+        /// <param name="requestBodyFormat">The formatting of the request body</param>
         /// <param name="uriParameters">Parameters that need to be in the Uri of the request. Should include the provided parameters if they should go in the uri</param>
         /// <param name="bodyParameters">Parameters that need to be in the body of the request. Should include the provided parameters if they should go in the body</param>
         /// <param name="headers">The headers that should be send with the request</param>
@@ -58,6 +60,7 @@ namespace CryptoExchange.Net.Authentication
             bool auth,
             ArrayParametersSerialization arraySerialization,
             HttpMethodParameterPosition parameterPosition,
+            RequestBodyFormat requestBodyFormat,
             out SortedDictionary<string, object> uriParameters,
             out SortedDictionary<string, object> bodyParameters,
             out Dictionary<string, string> headers
@@ -245,7 +248,7 @@ namespace CryptoExchange.Net.Authentication
         }
 
         /// <summary>
-        /// HMACSHA512 sign the data and return the hash
+        /// HMACSHA256 sign the data and return the hash
         /// </summary>
         /// <param name="data">Data to sign</param>
         /// <param name="outputType">String type</param>
@@ -267,7 +270,7 @@ namespace CryptoExchange.Net.Authentication
         }
 
         /// <summary>
-        /// HMACSHA512 sign the data and return the hash
+        /// HMACSHA384 sign the data and return the hash
         /// </summary>
         /// <param name="data">Data to sign</param>
         /// <param name="outputType">String type</param>

CryptoExchange.Net/Clients/BaseApiClient.cs

@@ -1,21 +1,10 @@
 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.Converters;
 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
+namespace CryptoExchange.Net.Clients
 {
     /// <summary>
     /// Base API for all API clients
@@ -37,37 +26,6 @@ namespace CryptoExchange.Net
         /// </summary>
         public AuthenticationProvider? AuthenticationProvider { get; private set; }
 
-        /// <summary>
-        /// Where to put the parameters for requests with different Http methods
-        /// </summary>
-        public Dictionary<HttpMethod, HttpMethodParameterPosition> ParameterPositions { get; set; } = new Dictionary<HttpMethod, HttpMethodParameterPosition>
-        {
-            { HttpMethod.Get, HttpMethodParameterPosition.InUri },
-            { HttpMethod.Post, HttpMethodParameterPosition.InBody },
-            { HttpMethod.Delete, HttpMethodParameterPosition.InBody },
-            { HttpMethod.Put, HttpMethodParameterPosition.InBody }
-        };
-
-        /// <summary>
-        /// Request body content type
-        /// </summary>
-        public RequestBodyFormat requestBodyFormat = RequestBodyFormat.Json;
-
-        /// <summary>
-        /// Whether or not we need to manually parse an error instead of relying on the http status code
-        /// </summary>
-        public bool manualParseError = false;
-
-        /// <summary>
-        /// How to serialize array parameters when making requests
-        /// </summary>
-        public ArrayParametersSerialization arraySerialization = ArrayParametersSerialization.Array;
-
-        /// <summary>
-        /// What request body should be set when no data is send (only used in combination with postParametersPosition.InBody)
-        /// </summary>
-        public string requestBodyEmptyContent = "{}";
-
         /// <summary>
         /// The environment this client communicates to
         /// </summary>
@@ -78,11 +36,6 @@ namespace CryptoExchange.Net
         /// </summary>
         public bool OutputOriginalData { get; }
 
-        /// <summary>
-        /// The default serializer
-        /// </summary>
-        protected virtual JsonSerializer DefaultSerializer { get; set; } = JsonSerializer.Create(SerializerOptions.Default);
-
         /// <summary>
         /// Api options
         /// </summary>
@@ -125,6 +78,9 @@ namespace CryptoExchange.Net
         /// <returns></returns>
         protected abstract AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials);
 
+        /// <inheritdoc />
+        public abstract string FormatSymbol(string baseAsset, string quoteAsset);
+
         /// <inheritdoc />
         public void SetApiCredentials<T>(T credentials) where T : ApiCredentials
         {
@@ -135,197 +91,6 @@ namespace CryptoExchange.Net
             }
         }
 
-        /// <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>
         /// Dispose
         /// </summary>

CryptoExchange.Net/Clients/BaseClient.cs

@@ -1,12 +1,11 @@
 using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
 using System.Collections.Generic;
 
-namespace CryptoExchange.Net
+namespace CryptoExchange.Net.Clients
 {
     /// <summary>
     /// The base for all clients, websocket client and rest client
@@ -16,7 +15,7 @@ namespace CryptoExchange.Net
         /// <summary>
         /// The name of the API the client is for
         /// </summary>
-        internal string Name { get; }
+        public string Exchange { get; }
 
         /// <summary>
         /// Api clients in this client
@@ -27,7 +26,7 @@ namespace CryptoExchange.Net
         /// The log object
         /// </summary>
         protected internal ILogger _logger;
-        
+
         /// <summary>
         /// Provided client options
         /// </summary>
@@ -37,14 +36,14 @@ namespace CryptoExchange.Net
         /// ctor
         /// </summary>
         /// <param name="logger">Logger</param>
-        /// <param name="name">The name of the API this client is for</param>
+        /// <param name="exchange">The name of the exchange this client is for</param>
 #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)
+        protected BaseClient(ILoggerFactory? logger, string exchange)
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         {
-            _logger = logger?.CreateLogger(name) ?? NullLoggerFactory.Instance.CreateLogger(name);
+            _logger = logger?.CreateLogger(exchange) ?? NullLoggerFactory.Instance.CreateLogger(exchange);
 
-            Name = name;
+            Exchange = exchange;
         }
 
         /// <summary>
@@ -58,7 +57,7 @@ namespace CryptoExchange.Net
                 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}");
+            _logger.Log(LogLevel.Trace, $"Client configuration: {options}, CryptoExchange.Net: v{typeof(BaseClient).Assembly.GetName().Version}, {Exchange}.Net: v{GetType().Assembly.GetName().Version}");
         }
 
         /// <summary>
@@ -75,7 +74,7 @@ namespace CryptoExchange.Net
         /// Register an API client
         /// </summary>
         /// <param name="apiClient">The client</param>
-        protected T AddApiClient<T>(T apiClient) where T:  BaseApiClient
+        protected T AddApiClient<T>(T apiClient) where T : BaseApiClient
         {
             if (ClientOptions == null)
                 throw new InvalidOperationException("Client should have called Initialize before adding API clients");

CryptoExchange.Net/Clients/BaseRestClient.cs

@@ -2,7 +2,7 @@ using System.Linq;
 using CryptoExchange.Net.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace CryptoExchange.Net
+namespace CryptoExchange.Net.Clients
 {
     /// <summary>
     /// Base rest client

CryptoExchange.Net/Clients/BaseSocketClient.cs

@@ -4,23 +4,24 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Sockets;
+using CryptoExchange.Net.Logging.Extensions;
+using CryptoExchange.Net.Objects.Sockets;
 using Microsoft.Extensions.Logging;
 
-namespace CryptoExchange.Net
+namespace CryptoExchange.Net.Clients
 {
     /// <summary>
     /// Base for socket client implementations
     /// </summary>
-    public abstract class BaseSocketClient: BaseClient, ISocketClient
+    public abstract class BaseSocketClient : BaseClient, ISocketClient
     {
         #region fields
-        
+
         /// <summary>
         /// If client is disposing
         /// </summary>
         protected bool _disposing;
-        
+
         /// <inheritdoc />
         public int CurrentConnections => ApiClients.OfType<SocketApiClient>().Sum(c => c.CurrentConnections);
         /// <inheritdoc />
@@ -33,8 +34,8 @@ namespace CryptoExchange.Net
         /// ctor
         /// </summary>
         /// <param name="logger">Logger</param>
-        /// <param name="name">The name of the API this client is for</param>
-        protected BaseSocketClient(ILoggerFactory? logger, string name) : base(logger, name)
+        /// <param name="exchange">The name of the exchange this client is for</param>
+        protected BaseSocketClient(ILoggerFactory? logger, string exchange) : base(logger, exchange)
         {
         }
 
@@ -45,11 +46,11 @@ namespace CryptoExchange.Net
         /// <returns></returns>
         public virtual async Task UnsubscribeAsync(int subscriptionId)
         {
-            foreach(var socket in ApiClients.OfType<SocketApiClient>())
+            foreach (var socket in ApiClients.OfType<SocketApiClient>())
             {
                 var result = await socket.UnsubscribeAsync(subscriptionId).ConfigureAwait(false);
                 if (result)
-                    break;                
+                    break;
             }
         }
 
@@ -63,7 +64,7 @@ namespace CryptoExchange.Net
             if (subscription == null)
                 throw new ArgumentNullException(nameof(subscription));
 
-            _logger.Log(LogLevel.Information, $"Socket {subscription.SocketId} Unsubscribing subscription  " + subscription.Id);
+            _logger.UnsubscribingSubscription(subscription.SocketId, subscription.Id);
             await subscription.CloseAsync().ConfigureAwait(false);
         }
 
@@ -73,10 +74,10 @@ namespace CryptoExchange.Net
         /// <returns></returns>
         public virtual async Task UnsubscribeAllAsync()
         {
-            var tasks = new List<Task>();            
+            var tasks = new List<Task>();
             foreach (var client in ApiClients.OfType<SocketApiClient>())
                 tasks.Add(client.UnsubscribeAllAsync());
-            
+
             await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
         }
 
@@ -86,7 +87,7 @@ namespace CryptoExchange.Net
         /// <returns></returns>
         public virtual async Task ReconnectAsync()
         {
-            _logger.Log(LogLevel.Information, $"Reconnecting all {CurrentConnections} connections");
+            _logger.ReconnectingAllConnections(CurrentConnections);
             var tasks = new List<Task>();
             foreach (var client in ApiClients.OfType<SocketApiClient>())
             {
@@ -101,9 +102,25 @@ namespace CryptoExchange.Net
         public string GetSubscriptionsState()
         {
             var result = new StringBuilder();
-            foreach(var client in ApiClients.OfType<SocketApiClient>())            
-                result.AppendLine(client.GetSubscriptionsState());            
+            foreach (var client in ApiClients.OfType<SocketApiClient>().Where(c => c.CurrentSubscriptions > 0))
+            {
+                result.AppendLine(client.GetSubscriptionsState());
+            }
             return result.ToString();
         }
+
+        /// <summary>
+        /// Returns the state of all socket api clients
+        /// </summary>
+        /// <returns></returns>
+        public List<SocketApiClient.SocketApiClientState> GetSocketApiClientStates()
+        {
+            var result = new List<SocketApiClient.SocketApiClientState>();
+            foreach (var client in ApiClients.OfType<SocketApiClient>())
+            {
+                result.Add(client.GetState());
+            }
+            return result;
+        }
     }
 }

CryptoExchange.Net/Clients/CryptoBaseClient.cs

@@ -0,0 +1,67 @@
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+
+namespace CryptoExchange.Net.Clients
+{
+    /// <summary>
+    /// Base crypto client
+    /// </summary>
+    public class CryptoBaseClient : IDisposable
+    {
+        private Dictionary<Type, object> _serviceCache = new Dictionary<Type, object>();
+
+        /// <summary>
+        /// Service provider
+        /// </summary>
+        protected readonly IServiceProvider? _serviceProvider;
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public CryptoBaseClient() { }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="serviceProvider"></param>
+        public CryptoBaseClient(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+            _serviceCache = new Dictionary<Type, object>();
+        }
+
+        /// <summary>
+        /// Try get a client by type for the service collection
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public T TryGet<T>(Func<T> createFunc)
+        {
+            var type = typeof(T);
+            if (_serviceCache.TryGetValue(type, out var value))
+                return (T)value;
+
+            if (_serviceProvider == null)
+            {
+                // Create with default options
+                var createResult = createFunc();
+                _serviceCache.Add(typeof(T), createResult!);
+                return createResult;
+            }
+
+            var result = _serviceProvider.GetService<T>() 
+                ?? throw new InvalidOperationException($"No service was found for {typeof(T).Name}, make sure the exchange is registered in dependency injection with the `services.Add[Exchange]()` method");
+            _serviceCache.Add(type, result!);
+            return result;
+        }
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            _serviceCache.Clear();
+        }
+    }
+}

CryptoExchange.Net/Clients/CryptoRestClient.cs

@@ -0,0 +1,47 @@
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Interfaces.CommonClients;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace CryptoExchange.Net.Clients
+{
+    /// <inheritdoc />
+    public class CryptoRestClient : CryptoBaseClient, ICryptoRestClient
+    {
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public CryptoRestClient()
+        {
+        }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="serviceProvider"></param>
+        public CryptoRestClient(IServiceProvider serviceProvider) : base(serviceProvider)
+        {
+        }
+
+        /// <summary>
+        /// Get a list of the registered ISpotClient implementations
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<ISpotClient> GetSpotClients()
+        {
+            if (_serviceProvider == null)
+                return new List<ISpotClient>();
+
+            return _serviceProvider.GetServices<ISpotClient>().ToList();
+        }
+
+        /// <summary>
+        /// Get an ISpotClient implementation by exchange name
+        /// </summary>
+        /// <param name="exchangeName"></param>
+        /// <returns></returns>
+        public ISpotClient? SpotClient(string exchangeName) => _serviceProvider?.GetServices<ISpotClient>()?.SingleOrDefault(s => s.ExchangeName.Equals(exchangeName, StringComparison.InvariantCultureIgnoreCase));
+    }
+}

CryptoExchange.Net/Clients/CryptoSocketClient.cs

@@ -0,0 +1,24 @@
+using CryptoExchange.Net.Interfaces;
+using System;
+
+namespace CryptoExchange.Net.Clients
+{
+    /// <inheritdoc />
+    public class CryptoSocketClient : CryptoBaseClient, ICryptoSocketClient
+    {
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public CryptoSocketClient()
+        {
+        }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="serviceProvider"></param>
+        public CryptoSocketClient(IServiceProvider serviceProvider) : base(serviceProvider)
+        {
+        }
+    }
+}

CryptoExchange.Net/Clients/RestApiClient.cs

@@ -8,15 +8,17 @@ using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using CryptoExchange.Net.Converters.JsonNet;
 using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Logging.Extensions;
 using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.RateLimiting;
+using CryptoExchange.Net.RateLimiting.Interfaces;
 using CryptoExchange.Net.Requests;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
-namespace CryptoExchange.Net
+namespace CryptoExchange.Net.Clients
 {
     /// <summary>
     /// Base rest API client for interacting with a REST API
@@ -35,15 +37,36 @@ namespace CryptoExchange.Net
         /// <inheritdoc />
         public int TotalRequestsMade { get; set; }
 
+        /// <summary>
+        /// Request body content type
+        /// </summary>
+        protected RequestBodyFormat RequestBodyFormat = RequestBodyFormat.Json;
+
+        /// <summary>
+        /// How to serialize array parameters when making requests
+        /// </summary>
+        protected ArrayParametersSerialization ArraySerialization = ArrayParametersSerialization.Array;
+
+        /// <summary>
+        /// What request body should be set when no data is send (only used in combination with postParametersPosition.InBody)
+        /// </summary>
+        protected string RequestBodyEmptyContent = "{}";
+
         /// <summary>
         /// Request headers to be sent with each request
         /// </summary>
         protected Dictionary<string, string>? StandardRequestHeaders { get; set; }
 
         /// <summary>
-        /// List of rate limiters
+        /// Where to put the parameters for requests with different Http methods
         /// </summary>
-        internal IEnumerable<IRateLimiter> RateLimiters { get; }
+        public Dictionary<HttpMethod, HttpMethodParameterPosition> ParameterPositions { get; set; } = new Dictionary<HttpMethod, HttpMethodParameterPosition>
+        {
+            { HttpMethod.Get, HttpMethodParameterPosition.InUri },
+            { HttpMethod.Post, HttpMethodParameterPosition.InBody },
+            { HttpMethod.Delete, HttpMethodParameterPosition.InBody },
+            { HttpMethod.Put, HttpMethodParameterPosition.InBody }
+        };
 
         /// <inheritdoc />
         public new RestExchangeOptions ClientOptions => (RestExchangeOptions)base.ClientOptions;
@@ -51,6 +74,7 @@ namespace CryptoExchange.Net
         /// <inheritdoc />
         public new RestApiOptions ApiOptions => (RestApiOptions)base.ApiOptions;
 
+
         /// <summary>
         /// ctor
         /// </summary>
@@ -59,22 +83,278 @@ namespace CryptoExchange.Net
         /// <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(ILogger logger, HttpClient? httpClient, string baseAddress, RestExchangeOptions options, RestApiOptions apiOptions) 
-            : base(logger, 
-                  apiOptions.OutputOriginalData ?? options.OutputOriginalData, 
+        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>
+        /// Create a message accessor instance
+        /// </summary>
+        /// <returns></returns>
+        protected virtual IStreamMessageAccessor CreateAccessor() => new JsonNetStreamMessageAccessor();
+
+        /// <summary>
+        /// Create a serializer instance
+        /// </summary>
+        /// <returns></returns>
+        protected virtual IMessageSerializer CreateSerializer() => new JsonNetMessageSerializer();
+
+        /// <summary>
+        /// Send a request to the base address based on the request definition
+        /// </summary>
+        /// <param name="baseAddress">Host and schema</param>
+        /// <param name="definition">Request definition</param>
+        /// <param name="parameters">Request parameters</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <param name="additionalHeaders">Additional headers for this request</param>
+        /// <param name="weight">Override the request weight for this request definition, for example when the weight depends on the parameters</param>
+        /// <returns></returns>
+        protected virtual async Task<WebCallResult> SendAsync(
+            string baseAddress,
+            RequestDefinition definition,
+            ParameterCollection? parameters,
+            CancellationToken cancellationToken,
+            Dictionary<string, string>? additionalHeaders = null,
+            int? weight = null)
+        { 
+            var result = await SendAsync<object>(baseAddress, definition, parameters, cancellationToken, additionalHeaders, weight).ConfigureAwait(false);
+            return result.AsDataless();
+        }
+
+        /// <summary>
+        /// Send a request to the base address based on the request definition
+        /// </summary>
+        /// <typeparam name="T">Response type</typeparam>
+        /// <param name="baseAddress">Host and schema</param>
+        /// <param name="definition">Request definition</param>
+        /// <param name="parameters">Request parameters</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <param name="additionalHeaders">Additional headers for this request</param>
+        /// <param name="weight">Override the request weight for this request definition, for example when the weight depends on the parameters</param>
+        /// <returns></returns>
+        protected virtual async Task<WebCallResult<T>> SendAsync<T>(
+            string baseAddress,
+            RequestDefinition definition,
+            ParameterCollection? parameters,
+            CancellationToken cancellationToken,
+            Dictionary<string, string>? additionalHeaders = null,
+            int? weight = null) where T : class
+        {
+            int currentTry = 0;
+            while (true)
+            {
+                currentTry++;
+                var prepareResult = await PrepareAsync(baseAddress, definition, parameters, cancellationToken, additionalHeaders, weight).ConfigureAwait(false);
+                if (!prepareResult)
+                    return new WebCallResult<T>(prepareResult.Error!);
+
+                var request = CreateRequest(baseAddress, definition, parameters, additionalHeaders);
+                _logger.RestApiSendRequest(request.RequestId, definition, request.Content, request.Uri.Query, string.Join(", ", request.GetHeaders().Select(h => h.Key + $"=[{string.Join(",", h.Value)}]")));
+                TotalRequestsMade++;
+                var result = await GetResponseAsync<T>(request, definition.RateLimitGate, cancellationToken).ConfigureAwait(false);
+                if (!result)
+                    _logger.RestApiErrorReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), result.Error?.ToString());
+                else
+                    _logger.RestApiResponseReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), OutputOriginalData ? result.OriginalData : "[Data only available when OutputOriginal = true]");
+
+                if (await ShouldRetryRequestAsync(definition.RateLimitGate, result, currentTry).ConfigureAwait(false))
+                    continue;
+
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// Prepare before sending a request. Sync time between client and server and check rate limits
+        /// </summary>
+        /// <param name="baseAddress">Host and schema</param>
+        /// <param name="definition">Request definition</param>
+        /// <param name="parameters">Request parameters</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <param name="additionalHeaders">Additional headers for this request</param>
+        /// <param name="weight">Override the request weight for this request</param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        protected virtual async Task<CallResult> PrepareAsync(
+            string baseAddress,
+            RequestDefinition definition,
+            ParameterCollection? parameters,
+            CancellationToken cancellationToken,
+            Dictionary<string, string>? additionalHeaders = null,
+            int? weight = null)
+        {
+            var requestId = ExchangeHelpers.NextId();
+            var requestWeight = weight ?? definition.Weight;
+
+            // Time sync
+            if (definition.Authenticated)
+            {
+                if (AuthenticationProvider == null)
+                {
+                    _logger.RestApiNoApiCredentials(requestId, definition.Path);
+                    return new CallResult<IRequest>(new NoApiCredentialsError());
+                }
+
+                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.RestApiFailedToSyncTime(requestId, syncTimeResult.Error!.ToString());
+                        return syncTimeResult.AsDataless();
+                    }
+                }
+            }            
+
+            // Rate limiting
+            if (requestWeight != 0)
+            {
+                if (definition.RateLimitGate == null)
+                    throw new Exception("Ratelimit gate not set when request weight is not 0");
+
+                if (ClientOptions.RateLimiterEnabled)
+                {
+                    var limitResult = await definition.RateLimitGate.ProcessAsync(_logger, requestId, RateLimitItemType.Request, definition, baseAddress, ApiOptions.ApiCredentials?.Key ?? ClientOptions.ApiCredentials?.Key, requestWeight, ClientOptions.RateLimitingBehaviour, cancellationToken).ConfigureAwait(false);
+                    if (!limitResult)
+                        return new CallResult(limitResult.Error!);
+                }
+            }
+
+            // Endpoint specific rate limiting
+            if (definition.EndpointLimitCount != null && definition.EndpointLimitPeriod != null)
+            {
+                if (definition.RateLimitGate == null)
+                    throw new Exception("Ratelimit gate not set when endpoint limit is specified");
+
+                if (ClientOptions.RateLimiterEnabled)
+                {
+                    var limitResult = await definition.RateLimitGate.ProcessSingleAsync(_logger, requestId, RateLimitItemType.Request, definition, baseAddress, ApiOptions.ApiCredentials?.Key ?? ClientOptions.ApiCredentials?.Key, requestWeight, ClientOptions.RateLimitingBehaviour, cancellationToken).ConfigureAwait(false);
+                    if (!limitResult)
+                        return new CallResult(limitResult.Error!);
+                }
+            }
+
+            return new CallResult(null);
+        }
+
+        /// <summary>
+        /// Creates a request object
+        /// </summary>
+        /// <param name="baseAddress">Host and schema</param>
+        /// <param name="definition">Request definition</param>
+        /// <param name="parameters">The parameters of the request</param>
+        /// <param name="additionalHeaders">Additional headers to send with the request</param>
+        /// <returns></returns>
+        protected virtual IRequest CreateRequest(
+            string baseAddress,
+            RequestDefinition definition,
+            ParameterCollection? parameters,
+            Dictionary<string, string>? additionalHeaders)
+        {
+            parameters ??= new ParameterCollection();
+            var uri = new Uri(baseAddress.AppendPath(definition.Path));
+            var parameterPosition = definition.ParameterPosition ?? ParameterPositions[definition.Method];
+            var arraySerialization = definition.ArraySerialization ?? ArraySerialization;
+            var bodyFormat = definition.RequestBodyFormat ?? RequestBodyFormat;
+            var requestId = ExchangeHelpers.NextId();
+
+            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,
+                        definition.Method,
+                        parameters,
+                        definition.Authenticated,
+                        arraySerialization,
+                        parameterPosition,
+                        bodyFormat,
+                        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(definition.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 = bodyFormat == RequestBodyFormat.Json ? Constants.JsonContentHeader : Constants.FormContentHeader;
+                if (bodyParameters.Any())
+                    WriteParamBody(request, bodyParameters, contentType);
+                else
+                    request.SetContent(RequestBodyEmptyContent, contentType);
+            }
+
+            return request;
+        }
+
         /// <summary>
         /// Execute a request to the uri and returns if it was successful
         /// </summary>
@@ -83,12 +363,12 @@ namespace CryptoExchange.Net
         /// <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="requestBodyFormat">The format of the body content</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>
+        /// <param name="gate">The ratelimit gate to use</param>
         /// <returns></returns>
         [return: NotNull]
         protected virtual async Task<WebCallResult> SendRequestAsync(
@@ -97,23 +377,28 @@ namespace CryptoExchange.Net
             CancellationToken cancellationToken,
             Dictionary<string, object>? parameters = null,
             bool signed = false,
+            RequestBodyFormat? requestBodyFormat = null,
             HttpMethodParameterPosition? parameterPosition = null,
             ArrayParametersSerialization? arraySerialization = null,
             int requestWeight = 1,
-            JsonSerializer? deserializer = null,
             Dictionary<string, string>? additionalHeaders = null,
-            bool ignoreRatelimit = false)
+            IRateLimitGate? gate = null)
         {
             int currentTry = 0;
             while (true)
             {
                 currentTry++;
-                var request = await PrepareRequestAsync(uri, method, cancellationToken, parameters, signed, parameterPosition, arraySerialization, requestWeight, deserializer, additionalHeaders, ignoreRatelimit).ConfigureAwait(false);
+                var request = await PrepareRequestAsync(uri, method, cancellationToken, parameters, signed, requestBodyFormat, parameterPosition, arraySerialization, requestWeight, additionalHeaders, gate).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))
+                var result = await GetResponseAsync<object>(request.Data, gate, cancellationToken).ConfigureAwait(false);
+                if (!result)
+                    _logger.RestApiErrorReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), result.Error?.ToString());
+                else
+                    _logger.RestApiResponseReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), OutputOriginalData ? result.OriginalData : "[Data only available when OutputOriginal = true]");
+
+                if (await ShouldRetryRequestAsync(gate, result, currentTry).ConfigureAwait(false))
                     continue;
 
                 return result.AsDataless();
@@ -129,12 +414,12 @@ namespace CryptoExchange.Net
         /// <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="requestBodyFormat">The format of the body content</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>
+        /// <param name="gate">The ratelimit gate to use</param>
         /// <returns></returns>
         [return: NotNull]
         protected virtual async Task<WebCallResult<T>> SendRequestAsync<T>(
@@ -143,24 +428,29 @@ namespace CryptoExchange.Net
             CancellationToken cancellationToken,
             Dictionary<string, object>? parameters = null,
             bool signed = false,
+            RequestBodyFormat? requestBodyFormat = null,
             HttpMethodParameterPosition? parameterPosition = null,
             ArrayParametersSerialization? arraySerialization = null,
             int requestWeight = 1,
-            JsonSerializer? deserializer = null,
             Dictionary<string, string>? additionalHeaders = null,
-            bool ignoreRatelimit = false
+            IRateLimitGate? gate = null
             ) 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);
+                var request = await PrepareRequestAsync(uri, method, cancellationToken, parameters, signed, requestBodyFormat, parameterPosition, arraySerialization, requestWeight, additionalHeaders, gate).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))
+                var result = await GetResponseAsync<T>(request.Data, gate, cancellationToken).ConfigureAwait(false);
+                if (!result)
+                    _logger.RestApiErrorReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), result.Error?.ToString());
+                else
+                    _logger.RestApiResponseReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), OutputOriginalData ? result.OriginalData : "[Data only available when OutputOriginal = true]");
+
+                if (await ShouldRetryRequestAsync(gate, result, currentTry).ConfigureAwait(false))
                     continue;
 
                 return result;
@@ -175,12 +465,12 @@ namespace CryptoExchange.Net
         /// <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="requestBodyFormat">The format of the body content</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>
+        /// <param name="gate">The rate limit gate to use</param>
         /// <returns></returns>
         protected virtual async Task<CallResult<IRequest>> PrepareRequestAsync(
             Uri uri,
@@ -188,17 +478,23 @@ namespace CryptoExchange.Net
             CancellationToken cancellationToken,
             Dictionary<string, object>? parameters = null,
             bool signed = false,
+            RequestBodyFormat? requestBodyFormat = null,
             HttpMethodParameterPosition? parameterPosition = null,
             ArrayParametersSerialization? arraySerialization = null,
             int requestWeight = 1,
-            JsonSerializer? deserializer = null,
             Dictionary<string, string>? additionalHeaders = null,
-            bool ignoreRatelimit = false)
+            IRateLimitGate? gate = null)
         {
             var requestId = ExchangeHelpers.NextId();
 
             if (signed)
             {
+                if (AuthenticationProvider == null)
+                {
+                    _logger.RestApiNoApiCredentials(requestId, uri.AbsolutePath);
+                    return new CallResult<IRequest>(new NoApiCredentialsError());
+                }
+
                 var syncTask = SyncTimeAsync();
                 var timeSyncInfo = GetTimeSyncInfo();
 
@@ -208,31 +504,28 @@ namespace CryptoExchange.Net
                     var syncTimeResult = await syncTask.ConfigureAwait(false);
                     if (!syncTimeResult)
                     {
-                        _logger.Log(LogLevel.Debug, $"[{requestId}] Failed to sync time, aborting request: " + syncTimeResult.Error);
+                        _logger.RestApiFailedToSyncTime(requestId, syncTimeResult.Error!.ToString());
                         return syncTimeResult.As<IRequest>(default);
                     }
                 }
             }
-
-            if (!ignoreRatelimit)
+            
+            if (requestWeight != 0)
             {
-                foreach (var limiter in RateLimiters)
+                if (gate == null)
+                    throw new Exception("Ratelimit gate not set when request weight is not 0");
+
+                if (ClientOptions.RateLimiterEnabled)
                 {
-                    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)
+                    var limitResult = await gate.ProcessAsync(_logger, requestId, RateLimitItemType.Request, new RequestDefinition(uri.AbsolutePath.TrimStart('/'), method) { Authenticated = signed }, uri.Host, ApiOptions.ApiCredentials?.Key ?? ClientOptions.ApiCredentials?.Key, requestWeight, ClientOptions.RateLimitingBehaviour, cancellationToken).ConfigureAwait(false);
+                    if (!limitResult)
                         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);
+            _logger.RestApiCreatingRequest(requestId, 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);
+            var request = ConstructRequest(uri, method, parameters?.OrderBy(p => p.Key).ToDictionary(p => p.Key, p => p.Value), signed, paramsPosition, arraySerialization ?? ArraySerialization, requestBodyFormat ?? RequestBodyFormat, requestId, additionalHeaders);
 
             string? paramString = "";
             if (paramsPosition == HttpMethodParameterPosition.InBody)
@@ -243,7 +536,7 @@ namespace CryptoExchange.Net
                 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 ?? " "}");
+            _logger.RestApiSendingRequest(requestId, method, signed ? "signed": "", request.Uri, paramString);
             return new CallResult<IRequest>(request);
         }
 
@@ -251,134 +544,103 @@ namespace CryptoExchange.Net
         /// 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="gate">The ratelimit gate used</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)
+            IRateLimitGate? gate,
+            CancellationToken cancellationToken)
         {
+            var sw = Stopwatch.StartNew();
+            Stream? responseStream = null;
+            IResponse? response = null;
+            IStreamMessageAccessor? accessor = null;
             try
             {
-                var sw = Stopwatch.StartNew();
-                var response = await request.GetResponseAsync(cancellationToken).ConfigureAwait(false);
+                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)
+                responseStream = await response.GetResponseStreamAsync().ConfigureAwait(false);
+                var outputOriginalData = ApiOptions.OutputOriginalData ?? ClientOptions.OutputOriginalData;
+
+                accessor = CreateAccessor();
+                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 its 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();
+                    // Error response
+                    await accessor.Read(responseStream, true).ConfigureAwait(false);
 
                     Error error;
                     if (response.StatusCode == (HttpStatusCode)418 || response.StatusCode == (HttpStatusCode)429)
-                        error = ParseRateLimitResponse((int)response.StatusCode, response.ResponseHeaders, data);
+                    {
+                        var rateError = ParseRateLimitResponse((int)response.StatusCode, response.ResponseHeaders, accessor);
+                        if (rateError.RetryAfter != null && gate != null && ClientOptions.RateLimiterEnabled)
+                        {
+                            _logger.RestApiRateLimitPauseUntil(request.RequestId, rateError.RetryAfter.Value);
+                            await gate.SetRetryAfterGuardAsync(rateError.RetryAfter.Value).ConfigureAwait(false);
+                        }
+
+                        error = rateError;
+                    }
                     else
-                        error = ParseErrorResponse((int)response.StatusCode, response.ResponseHeaders, data);
+                    {
+                        error = ParseErrorResponse((int)response.StatusCode, response.ResponseHeaders, accessor);
+                    }
 
                     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);
+
+                    return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, error!);
                 }
+
+                if (typeof(T) == typeof(object))
+                    // Success status code and expected empty response, assume it's correct
+                    return new WebCallResult<T>(statusCode, headers, sw.Elapsed, 0, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, null);
+
+                var valid = await accessor.Read(responseStream, outputOriginalData).ConfigureAwait(false);
+                if (!valid)
+                {
+                    // Invalid json
+                    var error = new ServerError("Failed to parse response", accessor.OriginalDataAvailable ? accessor.GetOriginalString() : "[Data only available when OutputOriginal = true in client options]");
+                    return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, error);
+                }
+
+                // Json response received
+                var parsedError = TryParseError(accessor);
+                if (parsedError != null)
+                    // Success status code, but TryParseError determined it was an error response
+                    return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, parsedError);
+
+                var deserializeResult = accessor.Deserialize<T>();
+                return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), deserializeResult.Data, deserializeResult.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));
+                return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, 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());
+                    return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, 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"));
+                    return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, new WebError($"Request timed out"));
                 }
             }
+            finally
+            {
+                accessor?.Clear();
+                responseStream?.Close();
+                response?.Close();
+            }
         }
 
         /// <summary>
@@ -386,22 +648,43 @@ namespace CryptoExchange.Net
         /// 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>
+        /// <param name="accessor">Data accessor</param>
         /// <returns>Null if not an error, Error otherwise</returns>
-        protected virtual Task<ServerError?> TryParseErrorAsync(JToken data)
-        {
-            return Task.FromResult<ServerError?>(null);
-        }
+        protected virtual ServerError? TryParseError(IMessageAccessor accessor) => 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="gate">The rate limit gate the call used</param>
         /// <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);
+        protected virtual async Task<bool> ShouldRetryRequestAsync<T>(IRateLimitGate? gate, WebCallResult<T> callResult, int tries)
+        {
+            if (tries >= 2)
+                // Only retry once
+                return false;
+
+            if ((int?)callResult.ResponseStatusCode == 429 
+                && ClientOptions.RateLimiterEnabled
+                && ClientOptions.RateLimitingBehaviour != RateLimitingBehaviour.Fail
+                && gate != null)
+            {
+                var retryTime = await gate.GetRetryAfterTime().ConfigureAwait(false);
+                if (retryTime == null)
+                    return false;
+
+                if (retryTime.Value - DateTime.UtcNow < TimeSpan.FromSeconds(60))
+                {
+                    _logger.RestApiRateLimitRetry(callResult.RequestId!.Value, retryTime.Value);
+                    return true;
+                }
+            }
+
+            return false;
+        }
 
         /// <summary>
         /// Creates a request object
@@ -412,6 +695,7 @@ namespace CryptoExchange.Net
         /// <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="bodyFormat">Format of the body content</param>
         /// <param name="requestId">Unique id of a request</param>
         /// <param name="additionalHeaders">Additional headers to send with the request</param>
         /// <returns></returns>
@@ -422,6 +706,7 @@ namespace CryptoExchange.Net
             bool signed,
             HttpMethodParameterPosition parameterPosition,
             ArrayParametersSerialization arraySerialization,
+            RequestBodyFormat bodyFormat,
             int requestId,
             Dictionary<string, string>? additionalHeaders)
         {
@@ -455,6 +740,7 @@ namespace CryptoExchange.Net
                         signed,
                         arraySerialization,
                         parameterPosition,
+                        bodyFormat,
                         out uriParameters,
                         out bodyParameters,
                         out headers);
@@ -502,11 +788,11 @@ namespace CryptoExchange.Net
 
             if (parameterPosition == HttpMethodParameterPosition.InBody)
             {
-                var contentType = requestBodyFormat == RequestBodyFormat.Json ? Constants.JsonContentHeader : Constants.FormContentHeader;
+                var contentType = bodyFormat == RequestBodyFormat.Json ? Constants.JsonContentHeader : Constants.FormContentHeader;
                 if (bodyParameters.Any())
                     WriteParamBody(request, bodyParameters, contentType);
                 else
-                    request.SetContent(requestBodyEmptyContent, contentType);
+                    request.SetContent(RequestBodyEmptyContent, contentType);
             }
 
             return request;
@@ -520,13 +806,13 @@ namespace CryptoExchange.Net
         /// <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)
+            if (contentType == Constants.JsonContentHeader)
             {
                 // Write the parameters as json in the body
-                var stringData = JsonConvert.SerializeObject(parameters);
+                var stringData = CreateSerializer().Serialize(parameters);
                 request.SetContent(stringData, contentType);
             }
-            else if (requestBodyFormat == RequestBodyFormat.FormData)
+            else if (contentType == Constants.FormContentHeader)
             {
                 // Write the parameters as form data in the body
                 var stringData = parameters.ToFormData();
@@ -539,35 +825,38 @@ namespace CryptoExchange.Net
         /// </summary>
         /// <param name="httpStatusCode">The response status code</param>
         /// <param name="responseHeaders">The response headers</param>
-        /// <param name="data">The response data</param>
+        /// <param name="accessor">Data accessor</param>
         /// <returns></returns>
-        protected virtual Error ParseErrorResponse(int httpStatusCode, IEnumerable<KeyValuePair<string, IEnumerable<string>>> responseHeaders, string data)
+        protected virtual Error ParseErrorResponse(int httpStatusCode, IEnumerable<KeyValuePair<string, IEnumerable<string>>> responseHeaders, IMessageAccessor accessor)
         {
-            return new ServerError(data);
+            var message = accessor.OriginalDataAvailable ? accessor.GetOriginalString() : "[Error response content only available when OutputOriginal = true in client options]";
+            return new ServerError(message);
         }
-        
+
         /// <summary>
         /// Parse a rate limit error response from the server. Only used when server returns http status 429 or 418
         /// </summary>
         /// <param name="httpStatusCode">The response status code</param>
         /// <param name="responseHeaders">The response headers</param>
-        /// <param name="data">The response data</param>
+        /// <param name="accessor">Data accessor</param>
         /// <returns></returns>
-        protected virtual Error ParseRateLimitResponse(int httpStatusCode, IEnumerable<KeyValuePair<string, IEnumerable<string>>> responseHeaders, string data)
+        protected virtual ServerRateLimitError ParseRateLimitResponse(int httpStatusCode, IEnumerable<KeyValuePair<string, IEnumerable<string>>> responseHeaders, IMessageAccessor accessor)
         {
+            var message = accessor.OriginalDataAvailable ? accessor.GetOriginalString() : "[Error response content only available when OutputOriginal = true in client options]";
+
             // Handle retry after header
             var retryAfterHeader = responseHeaders.SingleOrDefault(r => r.Key.Equals("Retry-After", StringComparison.InvariantCultureIgnoreCase));
             if (retryAfterHeader.Value?.Any() != true)
-                return new ServerRateLimitError(data);
+                return new ServerRateLimitError(message);
 
             var value = retryAfterHeader.Value.First();
             if (int.TryParse(value, out var seconds))
-                return new ServerRateLimitError(data) { RetryAfter = DateTime.UtcNow.AddSeconds(seconds) };
+                return new ServerRateLimitError(message) { RetryAfter = DateTime.UtcNow.AddSeconds(seconds) };
 
             if (DateTime.TryParse(value, out var datetime))
-                return new ServerRateLimitError(data) { RetryAfter = datetime };
+                return new ServerRateLimitError(message) { RetryAfter = datetime };
 
-            return new ServerRateLimitError(data);
+            return new ServerRateLimitError(message);
         }
 
         /// <summary>
@@ -580,14 +869,14 @@ namespace CryptoExchange.Net
         {
             var timeSyncParams = GetTimeSyncInfo();
             if (timeSyncParams == null)
-                return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, true, null);
+                return new WebCallResult<bool>(null, 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))
+                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, null, true, null);
+                    return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, true, null);
                 }
 
                 var localTime = DateTime.UtcNow;
@@ -611,12 +900,12 @@ namespace CryptoExchange.Net
                 }
 
                 // Calculate time offset between local and server
-                var offset = result.Data - (localTime.AddMilliseconds(result.ResponseTime!.Value.TotalMilliseconds / 2));
+                var offset = result.Data - localTime.AddMilliseconds(result.ResponseTime!.Value.TotalMilliseconds / 2);
                 timeSyncParams.UpdateTimeOffset(offset);
                 timeSyncParams.TimeSyncState.Semaphore.Release();
             }
 
-            return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, true, null);
+            return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, true, null);
         }
     }
 }

CryptoExchange.Net/Clients/SocketApiClient.cs

@@ -1,20 +1,22 @@
+using CryptoExchange.Net.Converters.JsonNet;
 using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Logging.Extensions;
 using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.RateLimiting.Interfaces;
 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.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using static CryptoExchange.Net.Objects.RateLimiter;
 
-namespace CryptoExchange.Net
+namespace CryptoExchange.Net.Clients
 {
     /// <summary>
     /// Base socket API client for interaction with a websocket API
@@ -40,46 +42,35 @@ namespace CryptoExchange.Net
         /// </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; }
+        protected List<SystemSubscription> systemSubscriptions = new();
 
         /// <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>
+        /// If true a subscription will accept message before the confirmation of a subscription has been received
+        /// </summary>
+        protected bool HandleMessageBeforeConfirmation { get; set; }
+
         /// <summary>
         /// The rate limiters 
         /// </summary>
-        protected internal IEnumerable<IRateLimiter>? RateLimiters { get; set; }
+        protected internal IRateLimitGate? RateLimiter { get; set; }
+
+        /// <summary>
+        /// The max size a websocket message size can be
+        /// </summary>
+        protected internal int? MessageSendSizeLimit { get; set; }
+
+        /// <summary>
+        /// Periodic task registrations
+        /// </summary>
+        protected List<PeriodicTaskRegistration> PeriodicTaskRegistrations { get; set; } = new List<PeriodicTaskRegistration>();
 
         /// <inheritdoc />
         public double IncomingKbps
@@ -104,16 +95,16 @@ namespace CryptoExchange.Net
                 if (!socketConnections.Any())
                     return 0;
 
-                return socketConnections.Sum(s => s.Value.SubscriptionCount);
+                return socketConnections.Sum(s => s.Value.UserSubscriptionCount);
             }
         }
 
-
         /// <inheritdoc />
         public new SocketExchangeOptions ClientOptions => (SocketExchangeOptions)base.ClientOptions;
 
         /// <inheritdoc />
         public new SocketApiOptions ApiOptions => (SocketApiOptions)base.ApiOptions;
+
         #endregion
 
         /// <summary>
@@ -123,64 +114,73 @@ namespace CryptoExchange.Net
         /// <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(ILogger logger, string baseAddress, SocketExchangeOptions options, SocketApiOptions apiOptions) 
-            : base(logger, 
+        public SocketApiClient(ILogger logger, string baseAddress, SocketExchangeOptions options, SocketApiOptions 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;
         }
 
         /// <summary>
-        /// Set a delegate to be used for processing data received from socket connections before it is processed by handlers
+        /// Create a message accessor instance
         /// </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)
+        /// <returns></returns>
+        protected internal virtual IByteMessageAccessor CreateAccessor() => new JsonNetByteMessageAccessor();
+
+        /// <summary>
+        /// Create a serializer instance
+        /// </summary>
+        /// <returns></returns>
+        protected internal virtual IMessageSerializer CreateSerializer() => new JsonNetMessageSerializer();
+
+        /// <summary>
+        /// Add a query to periodically send on each connection
+        /// </summary>
+        /// <param name="identifier"></param>
+        /// <param name="interval"></param>
+        /// <param name="queryDelegate"></param>
+        /// <param name="callback"></param>
+        protected virtual void RegisterPeriodicQuery(string identifier, TimeSpan interval, Func<SocketConnection, Query> queryDelegate, Action<CallResult>? callback)
         {
-            dataInterpreterBytes = byteHandler;
-            dataInterpreterString = stringHandler;
+            PeriodicTaskRegistrations.Add(new PeriodicTaskRegistration
+            {
+                Identifier = identifier,
+                Callback = callback,
+                Interval = interval,
+                QueryDelegate = queryDelegate
+            });
         }
 
         /// <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="subscription">The subscription</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)
+        protected virtual Task<CallResult<UpdateSubscription>> SubscribeAsync(Subscription subscription, CancellationToken ct)
         {
-            return SubscribeAsync(BaseAddress, request, identifier, authenticated, dataHandler, ct);
+            return SubscribeAsync(BaseAddress, subscription, 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="subscription">The subscription</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)
+        protected virtual async Task<CallResult<UpdateSubscription>> SubscribeAsync(string url, Subscription subscription, CancellationToken ct)
         {
             if (_disposing)
                 return new CallResult<UpdateSubscription>(new InvalidOperationError("Client disposed, can't subscribe"));
 
+            if (subscription.Authenticated && AuthenticationProvider == null)
+                return new CallResult<UpdateSubscription>(new NoApiCredentialsError());
+
             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
@@ -198,17 +198,18 @@ namespace CryptoExchange.Net
                 while (true)
                 {
                     // Get a new or existing socket connection
-                    var socketResult = await GetSocketConnection(url, authenticated).ConfigureAwait(false);
+                    var socketResult = await GetSocketConnection(url, subscription.Authenticated).ConfigureAwait(false);
                     if (!socketResult)
                         return socketResult.As<UpdateSubscription>(null);
 
                     socketConnection = socketResult.Data;
+                    subscription.HandleUpdatesBeforeConfirmation = subscription.HandleUpdatesBeforeConfirmation || HandleMessageBeforeConfirmation;
 
                     // Add a subscription on the socket connection
-                    subscription = AddSubscription(request, identifier, true, socketConnection, dataHandler, authenticated);
-                    if (subscription == null)
+                    var success = socketConnection.AddSubscription(subscription);
+                    if (!success)
                     {
-                        _logger.Log(LogLevel.Trace, $"Socket {socketConnection.SocketId} failed to add subscription, retrying on different connection");
+                        _logger.FailedToAddSubscriptionRetryOnDifferentConnection(socketConnection.SocketId);
                         continue;
                     }
 
@@ -221,7 +222,7 @@ namespace CryptoExchange.Net
 
                     var needsConnecting = !socketConnection.Connected;
 
-                    var connectResult = await ConnectIfNeededAsync(socketConnection, authenticated).ConfigureAwait(false);
+                    var connectResult = await ConnectIfNeededAsync(socketConnection, subscription.Authenticated).ConfigureAwait(false);
                     if (!connectResult)
                         return new CallResult<UpdateSubscription>(connectResult.Error!);
 
@@ -236,75 +237,53 @@ namespace CryptoExchange.Net
 
             if (socketConnection.PausedActivity)
             {
-                _logger.Log(LogLevel.Warning, $"Socket {socketConnection.SocketId} has been paused, can't subscribe at this moment");
+                _logger.HasBeenPausedCantSubscribeAtThisMoment(socketConnection.SocketId);
                 return new CallResult<UpdateSubscription>(new ServerError("Socket is paused"));
             }
 
-            if (request != null)
+            var waitEvent = new ManualResetEvent(false);
+            var subQuery = subscription.GetSubQuery(socketConnection);
+            if (subQuery != null)
             {
                 // Send the request and wait for answer
-                var subResult = await SubscribeAndWaitAsync(socketConnection, request, subscription).ConfigureAwait(false);
+                var subResult = await socketConnection.SendAndWaitQueryAsync(subQuery, waitEvent).ConfigureAwait(false);
                 if (!subResult)
                 {
-                    _logger.Log(LogLevel.Warning, $"Socket {socketConnection.SocketId} failed to subscribe: {subResult.Error}");
-                    await socketConnection.CloseAsync(subscription).ConfigureAwait(false);
+                    waitEvent?.Set();
+                    _logger.FailedToSubscribe(socketConnection.SocketId, subResult.Error?.ToString());
+                    // If this was a timeout we still need to send an unsubscribe to prevent messages coming in later
+                    var unsubscribe = subResult.Error is CancellationRequestedError;
+                    await socketConnection.CloseAsync(subscription, unsubscribe).ConfigureAwait(false);
                     return new CallResult<UpdateSubscription>(subResult.Error!);
                 }
-            }
-            else
-            {
-                // No request to be sent, so just mark the subscription as comfirmed
-                subscription.Confirmed = true;
+
+                subscription.HandleSubQueryResponse(subQuery.Response!);
             }
 
+            subscription.Confirmed = true;
             if (ct != default)
             {
                 subscription.CancellationTokenRegistration = ct.Register(async () =>
                 {
-                    _logger.Log(LogLevel.Information, $"Socket {socketConnection.SocketId} Cancellation token set, closing subscription");
+                    _logger.CancellationTokenSetClosingSubscription(socketConnection.SocketId, subscription.Id);
                     await socketConnection.CloseAsync(subscription).ConfigureAwait(false);
                 }, false);
             }
 
-            _logger.Log(LogLevel.Information, $"Socket {socketConnection.SocketId} subscription {subscription.Id} completed successfully");
+            waitEvent?.Set();
+            _logger.SubscriptionCompletedSuccessfully(socketConnection.SocketId, subscription.Id);
             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, 1, 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>
-        /// <param name="weight">Weight of the request</param>
+        /// <param name="query">The query</param>
         /// <returns></returns>
-        protected virtual Task<CallResult<T>> QueryAsync<T>(object request, bool authenticated, int weight = 1)
+        protected virtual Task<CallResult<T>> QueryAsync<T>(Query<T> query)
         {
-            return QueryAsync<T>(BaseAddress, request, authenticated, weight);
+            return QueryAsync(BaseAddress, query);
         }
 
         /// <summary>
@@ -312,11 +291,9 @@ namespace CryptoExchange.Net
         /// </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>
-        /// <param name="weight">Weight of the request</param>
+        /// <param name="query">The query</param>
         /// <returns></returns>
-        protected virtual async Task<CallResult<T>> QueryAsync<T>(string url, object request, bool authenticated, int weight = 1)
+        protected virtual async Task<CallResult<T>> QueryAsync<T>(string url, Query<T> query)
         {
             if (_disposing)
                 return new CallResult<T>(new InvalidOperationError("Client disposed, can't query"));
@@ -326,7 +303,7 @@ namespace CryptoExchange.Net
             await semaphoreSlim.WaitAsync().ConfigureAwait(false);
             try
             {
-                var socketResult = await GetSocketConnection(url, authenticated).ConfigureAwait(false);
+                var socketResult = await GetSocketConnection(url, query.Authenticated).ConfigureAwait(false);
                 if (!socketResult)
                     return socketResult.As<T>(default);
 
@@ -339,7 +316,7 @@ namespace CryptoExchange.Net
                     released = true;
                 }
 
-                var connectResult = await ConnectIfNeededAsync(socketConnection, authenticated).ConfigureAwait(false);
+                var connectResult = await ConnectIfNeededAsync(socketConnection, query.Authenticated).ConfigureAwait(false);
                 if (!connectResult)
                     return new CallResult<T>(connectResult.Error!);
             }
@@ -351,34 +328,11 @@ namespace CryptoExchange.Net
 
             if (socketConnection.PausedActivity)
             {
-                _logger.Log(LogLevel.Warning, $"Socket {socketConnection.SocketId} has been paused, can't send query at this moment");
+                _logger.HasBeenPausedCantSendQueryAtThisMoment(socketConnection.SocketId);
                 return new CallResult<T>(new ServerError("Socket is paused"));
             }
 
-            return await QueryAndWaitAsync<T>(socketConnection, request, weight).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>
-        /// <param name="weight">The weight of the query</param>
-        /// <returns></returns>
-        protected virtual async Task<CallResult<T>> QueryAndWaitAsync<T>(SocketConnection socket, object request, int weight)
-        {
-            var dataResult = new CallResult<T>(new ServerError("No response on query received"));
-            await socket.SendAndWaitAsync(request, ClientOptions.RequestTimeout, null, weight, data =>
-            {
-                if (!HandleQueryResponse<T>(socket, request, data, out var callResult))
-                    return false;
-
-                dataResult = callResult;
-                return true;
-            }).ConfigureAwait(false);
-
-            return dataResult;
+            return await socketConnection.SendAndWaitQueryAsync(query).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -387,164 +341,71 @@ namespace CryptoExchange.Net
         /// <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)
+        protected virtual async Task<CallResult> ConnectIfNeededAsync(SocketConnection socket, bool authenticated)
         {
             if (socket.Connected)
-                return new CallResult<bool>(true);
+                return new CallResult(null);
 
             var connectResult = await ConnectSocketAsync(socket).ConfigureAwait(false);
             if (!connectResult)
-                return new CallResult<bool>(connectResult.Error!);
+                return connectResult;
 
             if (ClientOptions.DelayAfterConnect != TimeSpan.Zero)
                 await Task.Delay(ClientOptions.DelayAfterConnect).ConfigureAwait(false);
 
             if (!authenticated || socket.Authenticated)
-                return new CallResult<bool>(true);
+                return new CallResult(null);
 
-            _logger.Log(LogLevel.Debug, $"Socket {socket.SocketId} Attempting to authenticate");
-            var result = await AuthenticateSocketAsync(socket).ConfigureAwait(false);
-            if (!result)
+            return await AuthenticateSocketAsync(socket).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Authenticate a socket connection
+        /// </summary>
+        /// <param name="socket">Socket to authenticate</param>
+        /// <returns></returns>
+        public virtual async Task<CallResult> AuthenticateSocketAsync(SocketConnection socket)
+        {
+            if (AuthenticationProvider == null)
+                return new CallResult(new NoApiCredentialsError());
+
+            _logger.AttemptingToAuthenticate(socket.SocketId);
+            var authRequest = GetAuthenticationRequest();
+            if (authRequest != null)
             {
-                _logger.Log(LogLevel.Warning, $"Socket {socket.SocketId} authentication failed");
-                if (socket.Connected)
-                    await socket.CloseAsync().ConfigureAwait(false);
+                var result = await socket.SendAndWaitQueryAsync(authRequest).ConfigureAwait(false);
 
-                result.Error!.Message = "Authentication failed: " + result.Error.Message;
-                return new CallResult<bool>(result.Error);
+                if (!result)
+                {
+                    _logger.AuthenticationFailed(socket.SocketId);
+                    if (socket.Connected)
+                        await socket.CloseAsync().ConfigureAwait(false);
+
+                    result.Error!.Message = "Authentication failed: " + result.Error.Message;
+                    return new CallResult(result.Error)!;
+                }
             }
 
-            _logger.Log(LogLevel.Debug, $"Socket {socket.SocketId} authenticated");
+            _logger.Authenticated(socket.SocketId);
             socket.Authenticated = true;
-            return new CallResult<bool>(true);
+            return new CallResult(null);
         }
 
         /// <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.
+        /// Should return the request which can be used to authenticate a socket connection
         /// </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);
+        protected internal virtual Query? GetAuthenticationRequest() => throw new NotImplementedException();
 
         /// <summary>
-        /// Optional handler to interpolate data before sending it to the handlers
+        /// Adds a system subscription. Used for example to reply to ping requests
         /// </summary>
-        /// <param name="message"></param>
-        /// <returns></returns>
-        protected internal virtual JToken ProcessTokenData(JToken message)
+        /// <param name="systemSubscription">The subscription</param>
+        protected void AddSystemSubscription(SystemSubscription systemSubscription)
         {
-            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, null));
-                    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, null));
-            }
-
-            var subscription = request == null
-                ? SocketSubscription.CreateForIdentifier(ExchangeHelpers.NextId(), identifier!, userSubscription, authenticated, InternalHandler)
-                : SocketSubscription.CreateForRequest(ExchangeHelpers.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(ExchangeHelpers.NextId(), identifier, false, false, action);
+            systemSubscriptions.Add(systemSubscription);
             foreach (var connection in socketConnections.Values)
-                connection.AddSubscription(subscription);
+                connection.AddSubscription(systemSubscription);
         }
 
         /// <summary>
@@ -569,13 +430,13 @@ namespace CryptoExchange.Net
         }
 
         /// <summary>
-        /// Update the original request to send when the connection is restored after disconnecting. Can be used to update an authentication token for example.
+        /// Update the subscription 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>
+        /// <param name="subscription">The subscription</param>
         /// <returns></returns>
-        protected internal virtual Task<CallResult<object>> RevitalizeRequestAsync(object request)
+        protected internal virtual Task<CallResult> RevitalizeRequestAsync(Subscription subscription)
         {
-            return Task.FromResult(new CallResult<object>(request));
+            return Task.FromResult(new CallResult(null));
         }
 
         /// <summary>
@@ -588,37 +449,36 @@ namespace CryptoExchange.Net
         {
             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();
+                                                  && s.Value.ApiClient.GetType() == GetType()
+                                                  && (s.Value.Authenticated == authenticated || !authenticated) && s.Value.Connected).OrderBy(s => s.Value.UserSubscriptionCount).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)))
-                {
+                if (result.UserSubscriptionCount < ClientOptions.SocketSubscriptionsCombineTarget || socketConnections.Count >= (ApiOptions.MaxSocketConnections ?? ClientOptions.MaxSocketConnections) && socketConnections.All(s => s.Value.UserSubscriptionCount >= 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);
+                _logger.FailedToDetermineConnectionUrl(connectionAddress.Error?.ToString());
                 return connectionAddress.As<SocketConnection>(null);
             }
 
             if (connectionAddress.Data != address)
-                _logger.Log(LogLevel.Debug, $"Connection address set to " + connectionAddress.Data);
+                _logger.ConnectionAddressSetTo(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(ExchangeHelpers.NextId(), kvp.Key, false, false, kvp.Value);
-                socketConnection.AddSubscription(handler);
-            }
+
+            foreach (var ptg in PeriodicTaskRegistrations)
+                socketConnection.QueryPeriodic(ptg.Identifier, ptg.Interval, ptg.QueryDelegate, ptg.Callback);
+
+            foreach (var systemSubscription in systemSubscriptions)
+                socketConnection.AddSubscription(systemSubscription);
 
             return new CallResult<SocketConnection>(socketConnection);
         }
@@ -626,8 +486,8 @@ namespace CryptoExchange.Net
         /// <summary>
         /// Process an unhandled message
         /// </summary>
-        /// <param name="token">The token that wasn't processed</param>
-        protected virtual void HandleUnhandledMessage(JToken token)
+        /// <param name="message">The message that wasn't processed</param>
+        protected virtual void HandleUnhandledMessage(IMessageAccessor message)
         {
         }
 
@@ -636,16 +496,17 @@ namespace CryptoExchange.Net
         /// </summary>
         /// <param name="socketConnection">The socket to connect</param>
         /// <returns></returns>
-        protected virtual async Task<CallResult<bool>> ConnectSocketAsync(SocketConnection socketConnection)
+        protected virtual async Task<CallResult> ConnectSocketAsync(SocketConnection socketConnection)
         {
-            if (await socketConnection.ConnectAsync().ConfigureAwait(false))
+            var connectResult = await socketConnection.ConnectAsync().ConfigureAwait(false);
+            if (connectResult)
             {
                 socketConnections.TryAdd(socketConnection.SocketId, socketConnection);
-                return new CallResult<bool>(true);
+                return connectResult;
             }
 
             socketConnection.Dispose();
-            return new CallResult<bool>(new CantConnectError());
+            return connectResult;
         }
 
         /// <summary>
@@ -656,11 +517,10 @@ namespace CryptoExchange.Net
         protected virtual WebSocketParameters GetWebSocketParameters(string address)
             => new(new Uri(address), ClientOptions.AutoReconnect)
             {
-                DataInterpreterBytes = dataInterpreterBytes,
-                DataInterpreterString = dataInterpreterString,
                 KeepAliveInterval = KeepAliveInterval,
                 ReconnectInterval = ClientOptions.ReconnectInterval,
-                RateLimiters = RateLimiters,
+                RateLimiter = ClientOptions.RateLimiterEnabled ? RateLimiter : null,
+                RateLimitingBehaviour = ClientOptions.RateLimitingBehaviour,
                 Proxy = ClientOptions.Proxy,
                 Timeout = ApiOptions.SocketNoDataTimeout ?? ClientOptions.SocketNoDataTimeout
             };
@@ -673,57 +533,10 @@ namespace CryptoExchange.Net
         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);
+            _logger.SocketCreatedForAddress(socket.Id, 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>
-        protected 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(ExchangeHelpers.NextId(), obj, 1);
-                        }
-                        catch (Exception ex)
-                        {
-                            _logger.Log(LogLevel.Warning, $"Socket {socketConnection.SocketId} Periodic send {identifier} failed: " + ex.ToLogString());
-                        }
-                    }
-                }
-            });
-        }
-
         /// <summary>
         /// Unsubscribe an update subscription
         /// </summary>
@@ -731,7 +544,7 @@ namespace CryptoExchange.Net
         /// <returns></returns>
         public virtual async Task<bool> UnsubscribeAsync(int subscriptionId)
         {
-            SocketSubscription? subscription = null;
+            Subscription? subscription = null;
             SocketConnection? connection = null;
             foreach (var socket in socketConnections.Values.ToList())
             {
@@ -746,7 +559,7 @@ namespace CryptoExchange.Net
             if (subscription == null || connection == null)
                 return false;
 
-            _logger.Log(LogLevel.Information, $"Socket {connection.SocketId} Unsubscribing subscription " + subscriptionId);
+            _logger.UnsubscribingSubscription(connection.SocketId, subscriptionId);
             await connection.CloseAsync(subscription).ConfigureAwait(false);
             return true;
         }
@@ -761,7 +574,7 @@ namespace CryptoExchange.Net
             if (subscription == null)
                 throw new ArgumentNullException(nameof(subscription));
 
-            _logger.Log(LogLevel.Information, $"Socket {subscription.SocketId} Unsubscribing subscription  " + subscription.Id);
+            _logger.UnsubscribingSubscription(subscription.SocketId, subscription.Id);
             await subscription.CloseAsync().ConfigureAwait(false);
         }
 
@@ -771,16 +584,16 @@ namespace CryptoExchange.Net
         /// <returns></returns>
         public virtual async Task UnsubscribeAllAsync()
         {
-            var sum = socketConnections.Sum(s => s.Value.SubscriptionCount);
+            var sum = socketConnections.Sum(s => s.Value.UserSubscriptionCount);
             if (sum == 0)
                 return;
 
-            _logger.Log(LogLevel.Information, $"Unsubscribing all {socketConnections.Sum(s => s.Value.SubscriptionCount)} subscriptions");
+            _logger.UnsubscribingAll(socketConnections.Sum(s => s.Value.UserSubscriptionCount));
             var tasks = new List<Task>();
             {
                 var socketList = socketConnections.Values;
                 foreach (var sub in socketList)
-                    tasks.Add(sub.CloseAsync()); 
+                    tasks.Add(sub.CloseAsync());
             }
 
             await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
@@ -792,7 +605,7 @@ namespace CryptoExchange.Net
         /// <returns></returns>
         public virtual async Task ReconnectAsync()
         {
-            _logger.Log(LogLevel.Information, $"Reconnecting all {socketConnections.Count} connections");
+            _logger.ReconnectingAllConnections(socketConnections.Count);
             var tasks = new List<Task>();
             {
                 var socketList = socketConnections.Values;
@@ -806,17 +619,78 @@ namespace CryptoExchange.Net
         /// <summary>
         /// Log the current state of connections and subscriptions
         /// </summary>
-        public string GetSubscriptionsState()
+        public string GetSubscriptionsState(bool includeSubDetails = true)
         {
-            var sb = new StringBuilder();
-            sb.AppendLine($"{socketConnections.Count} connections, {CurrentSubscriptions} subscriptions, kbps: {IncomingKbps}");
-            foreach (var connection in socketConnections)
+            return GetState(includeSubDetails).ToString();
+        }
+
+        /// <summary>
+        /// Gets the state of the client
+        /// </summary>
+        /// <param name="includeSubDetails">True to get details for each subscription</param>
+        /// <returns></returns>
+        public SocketApiClientState GetState(bool includeSubDetails = true)
+        {
+            var connectionStates = new List<SocketConnection.SocketConnectionState>();
+            foreach (var socketIdAndConnection 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}");
+                SocketConnection connection = socketIdAndConnection.Value;
+                SocketConnection.SocketConnectionState connectionState = connection.GetState(includeSubDetails);
+                connectionStates.Add(connectionState);
+            }
+
+            return new SocketApiClientState(socketConnections.Count, CurrentSubscriptions, IncomingKbps, connectionStates);
+        }
+
+        /// <summary>
+        /// Get the current state of the client
+        /// </summary>
+        /// <param name="Connections">Number of sockets for this client</param>
+        /// <param name="Subscriptions">Total number of subscriptions</param>
+        /// <param name="DownloadSpeed">Total download speed</param>
+        /// <param name="ConnectionStates">State of each socket connection</param>
+        public record SocketApiClientState(
+            int Connections,
+            int Subscriptions,
+            double DownloadSpeed,
+            List<SocketConnection.SocketConnectionState> ConnectionStates)
+        {
+            /// <summary>
+            /// Print the state of the client
+            /// </summary>
+            /// <param name="sb"></param>
+            /// <returns></returns>
+            protected virtual bool PrintMembers(StringBuilder sb)
+            {
+                sb.AppendLine();
+                sb.AppendLine($"\tTotal connections: {Connections}");
+                sb.AppendLine($"\tTotal subscriptions: {Subscriptions}");
+                sb.AppendLine($"\tDownload speed: {DownloadSpeed} kbps");
+                sb.AppendLine($"\tConnections:");
+                ConnectionStates.ForEach(cs =>
+                {
+                    sb.AppendLine($"\t\tId: {cs.Id}");
+                    sb.AppendLine($"\t\tAddress: {cs.Address}");
+                    sb.AppendLine($"\t\tTotal subscriptions: {cs.Subscriptions}");
+                    sb.AppendLine($"\t\tStatus: {cs.Status}");
+                    sb.AppendLine($"\t\tAuthenticated: {cs.Authenticated}");
+                    sb.AppendLine($"\t\tDownload speed: {cs.DownloadSpeed} kbps");
+                    sb.AppendLine($"\t\tPending queries: {cs.PendingQueries}");
+                    if (cs.SubscriptionStates?.Count > 0)
+                    {
+                        sb.AppendLine($"\t\tSubscriptions:");
+                        cs.SubscriptionStates.ForEach(subState =>
+                        {
+                            sb.AppendLine($"\t\t\tId: {subState.Id}");
+                            sb.AppendLine($"\t\t\tConfirmed: {subState.Confirmed}");
+                            sb.AppendLine($"\t\t\tInvocations: {subState.Invocations}");
+                            sb.AppendLine($"\t\t\tIdentifiers: [{string.Join(",", subState.Identifiers)}]");
+                        });
+                    }
+                });
+
+                return true;
             }
-            return sb.ToString();
         }
 
         /// <summary>
@@ -825,15 +699,28 @@ namespace CryptoExchange.Net
         public override void Dispose()
         {
             _disposing = true;
-            periodicEvent?.Set();
-            periodicEvent?.Dispose();
-            if (socketConnections.Sum(s => s.Value.SubscriptionCount) > 0)
+            if (socketConnections.Sum(s => s.Value.UserSubscriptionCount) > 0)
             {
-                _logger.Log(LogLevel.Debug, "Disposing socket client, closing all subscriptions");
+                _logger.DisposingSocketClient();
                 _ = UnsubscribeAllAsync();
             }
             semaphoreSlim?.Dispose();
             base.Dispose();
         }
+
+        /// <summary>
+        /// Get the listener identifier for the message
+        /// </summary>
+        /// <param name="messageAccessor"></param>
+        /// <returns></returns>
+        public abstract string? GetListenerIdentifier(IMessageAccessor messageAccessor);
+
+        /// <summary>
+        /// Preprocess a stream message
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public virtual ReadOnlyMemory<byte> PreprocessStreamMessage(WebSocketMessageType type, ReadOnlyMemory<byte> data) => data;
     }
 }

CryptoExchange.Net/CommonObjects/Enums.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace CryptoExchange.Net.CommonObjects
+namespace CryptoExchange.Net.CommonObjects
 {
     /// <summary>
     /// Order type

CryptoExchange.Net/CommonObjects/OrderBook.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace CryptoExchange.Net.CommonObjects
 {

CryptoExchange.Net/CommonObjects/OrderId.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace CryptoExchange.Net.CommonObjects
+namespace CryptoExchange.Net.CommonObjects
 {
     /// <summary>
     /// Id of an order

CryptoExchange.Net/CommonObjects/Ticker.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace CryptoExchange.Net.CommonObjects
+namespace CryptoExchange.Net.CommonObjects
 {
     /// <summary>
     /// Ticker data

CryptoExchange.Net/Converters/ArrayPropertyAttribute.cs

@@ -0,0 +1,25 @@
+using System;
+
+namespace CryptoExchange.Net.Converters
+{
+    /// <summary>
+    /// Mark property as an index in the array
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property)]
+    public class ArrayPropertyAttribute : Attribute
+    {
+        /// <summary>
+        /// The index in the array
+        /// </summary>
+        public int Index { get; }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="index"></param>
+        public ArrayPropertyAttribute(int index)
+        {
+            Index = index;
+        }
+    }
+}

CryptoExchange.Net/Converters/JsonNet/ArrayConverter.cs

@@ -8,7 +8,7 @@ using CryptoExchange.Net.Attributes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace CryptoExchange.Net.Converters
+namespace CryptoExchange.Net.Converters.JsonNet
 {
     /// <summary>
     /// Converter for arrays to objects. Can deserialize data like [0.1, 0.2, "test"] to an object. Mapping is done by marking the class with [JsonConverter(typeof(ArrayConverter))] and the properties
@@ -192,25 +192,4 @@ namespace CryptoExchange.Net.Converters
         private static T? GetCustomAttribute<T>(Type type) where T : Attribute =>
             (T?)_attributeByTypeAndTypeCache.GetOrAdd((type, typeof(T)), tuple => type.GetCustomAttribute(typeof(T)));
     }
-
-    /// <summary>
-    /// Mark property as an index in the array
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
-    public class ArrayPropertyAttribute: Attribute
-    {
-        /// <summary>
-        /// The index in the array
-        /// </summary>
-        public int Index { get; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="index"></param>
-        public ArrayPropertyAttribute(int index)
-        {
-            Index = index;
-        }
-    }
 }

CryptoExchange.Net/Converters/JsonNet/BaseConverter.cs

@@ -4,7 +4,7 @@ using System.Diagnostics;
 using System.Linq;
 using Newtonsoft.Json;
 
-namespace CryptoExchange.Net.Converters
+namespace CryptoExchange.Net.Converters.JsonNet
 {
     /// <summary>
     /// Base class for enum converters

CryptoExchange.Net/Converters/JsonNet/BoolConverter.cs

@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace CryptoExchange.Net.Converters
+namespace CryptoExchange.Net.Converters.JsonNet
 {
     /// <summary>
     /// Boolean converter with support for "0"/"1" (strings)
@@ -34,7 +34,16 @@ namespace CryptoExchange.Net.Converters
         /// </returns>
         public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
         {
-            switch (reader.Value?.ToString().ToLower().Trim())
+            var value = reader.Value?.ToString().ToLower().Trim();
+            if (value == null || value == "")
+            {
+                if (Nullable.GetUnderlyingType(objectType) != null)
+                    return null;
+
+                return false;
+            }
+
+            switch (value)
             {
                 case "true":
                 case "yes":

CryptoExchange.Net/Converters/JsonNet/DateTimeConverter.cs

@@ -4,7 +4,7 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 
-namespace CryptoExchange.Net.Converters
+namespace CryptoExchange.Net.Converters.JsonNet
 {
     /// <summary>
     /// Datetime converter. Supports converting from string/long/double to DateTime and back. Numbers are assumed to be the time since 1970-01-01.
@@ -26,7 +26,12 @@ namespace CryptoExchange.Net.Converters
         public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
         {
             if (reader.Value == null)
+            {
+                if (objectType == typeof(DateTime))
+                    return default(DateTime);
+
                 return null;
+            }
 
             if(reader.TokenType is JsonToken.Integer)
             {
@@ -56,11 +61,27 @@ namespace CryptoExchange.Net.Converters
             else if(reader.TokenType is JsonToken.String)
             {
                 var stringValue = (string)reader.Value;
-                if (string.IsNullOrWhiteSpace(stringValue))
-                    return null;
-
-                if (string.IsNullOrWhiteSpace(stringValue) || stringValue == "0" || stringValue == "-1")
+                if (string.IsNullOrWhiteSpace(stringValue)
+                    || stringValue == "-1"
+                    || (double.TryParse(stringValue, out var doubleVal) && doubleVal == 0))
+                {
                     return objectType == typeof(DateTime) ? default(DateTime) : null;
+                }
+
+                if (stringValue.Length == 12 && stringValue.StartsWith("202"))
+                {
+                    // Parse 202303261200 format
+                    if (!int.TryParse(stringValue.Substring(0, 4), out var year)
+                        || !int.TryParse(stringValue.Substring(4, 2), out var month)
+                        || !int.TryParse(stringValue.Substring(6, 2), out var day)
+                        || !int.TryParse(stringValue.Substring(8, 2), out var hour)
+                        || !int.TryParse(stringValue.Substring(10, 2), out var minute))
+                    {
+                        Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + reader.Value);
+                        return default;
+                    }
+                    return new DateTime(year, month, day, hour, minute, 0, DateTimeKind.Utc);
+                }
 
                 if (stringValue.Length == 8)
                 {

CryptoExchange.Net/Converters/JsonNet/DecimalStringWriterConverter.cs

@@ -0,0 +1,27 @@
+using Newtonsoft.Json;
+using System;
+using System.Globalization;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <summary>
+    /// Converter for serializing decimal values as string
+    /// </summary>
+    public class DecimalStringWriterConverter : JsonConverter
+    {
+        /// <inheritdoc />
+        public override bool CanRead => false;
+
+        /// <inheritdoc />
+        public override bool CanConvert(Type objectType) => objectType == typeof(decimal) || objectType == typeof(decimal?);
+
+        /// <inheritdoc />
+        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <inheritdoc />
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) => writer.WriteValue(((decimal?)value)?.ToString(CultureInfo.InvariantCulture) ?? null);
+    }
+}

CryptoExchange.Net/Converters/JsonNet/EnumConverter.cs

@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
-namespace CryptoExchange.Net.Converters
+namespace CryptoExchange.Net.Converters.JsonNet
 {
     /// <summary>
     /// Converter for enum values. Enums entries should be noted with a MapAttribute to map the enum value to a string value
@@ -47,7 +47,7 @@ namespace CryptoExchange.Net.Converters
                 mapping = AddMapping(enumType);
 
             var stringValue = reader.Value?.ToString();
-            if (stringValue == null)
+            if (stringValue == null || stringValue == "")
             {
                 // Received null value
                 var emptyResult = GetDefaultValue(objectType, enumType);

CryptoExchange.Net/Converters/JsonNet/JsonNetMessageAccessor.cs

@@ -0,0 +1,337 @@
+using CryptoExchange.Net.Converters.MessageParsing;
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Objects;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <summary>
+    /// Json.Net message accessor
+    /// </summary>
+    public abstract class JsonNetMessageAccessor : IMessageAccessor
+    {
+        /// <summary>
+        /// The json token loaded
+        /// </summary>
+        protected JToken? _token;
+        private static readonly JsonSerializer _serializer = JsonSerializer.Create(SerializerOptions.WithConverters);
+
+        /// <inheritdoc />
+        public bool IsJson { get; protected set; }
+
+        /// <inheritdoc />
+        public abstract bool OriginalDataAvailable { get; }
+
+        /// <inheritdoc />
+        public object? Underlying => _token;
+
+        /// <inheritdoc />
+        public CallResult<object> Deserialize(Type type, MessagePath? path = null)
+        {
+            if (!IsJson)
+                return new CallResult<object>(GetOriginalString());
+
+            var source = _token;
+            if (path != null)
+                source = GetPathNode(path.Value);
+
+            try
+            {
+                var result = source!.ToObject(type, _serializer)!;
+                return new CallResult<object>(result);
+            }
+            catch (JsonReaderException jre)
+            {
+                var info = $"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}";
+                return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+            catch (JsonSerializationException jse)
+            {
+                var info = $"Deserialize JsonSerializationException: {jse.Message}";
+                return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+            catch (Exception ex)
+            {
+                var exceptionInfo = ex.ToLogString();
+                var info = $"Deserialize Unknown Exception: {exceptionInfo}";
+                return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+        }
+
+        /// <inheritdoc />
+        public CallResult<T> Deserialize<T>(MessagePath? path = null)
+        {
+            var source = _token;
+            if (path != null)
+                source = GetPathNode(path.Value);
+
+            try
+            {
+                var result = source!.ToObject<T>(_serializer)!;
+                return new CallResult<T>(result);
+            }
+            catch (JsonReaderException jre)
+            {
+                var info = $"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}";
+                return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+            catch (JsonSerializationException jse)
+            {
+                var info = $"Deserialize JsonSerializationException: {jse.Message}";
+                return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+            catch (Exception ex)
+            {
+                var exceptionInfo = ex.ToLogString();
+                var info = $"Deserialize Unknown Exception: {exceptionInfo}";
+                return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+        }
+
+        /// <inheritdoc />
+        public NodeType? GetNodeType()
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            if (_token == null)
+                return null;
+
+            if (_token.Type == JTokenType.Object)
+                return NodeType.Object;
+
+            if (_token.Type == JTokenType.Array)
+                return NodeType.Array;
+
+            return NodeType.Value;
+        }
+
+        /// <inheritdoc />
+        public NodeType? GetNodeType(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            var node = GetPathNode(path);
+            if (node == null)
+                return null;
+
+            if (node.Type == JTokenType.Object)
+                return NodeType.Object;
+
+            if (node.Type == JTokenType.Array)
+                return NodeType.Array;
+
+            return NodeType.Value;
+        }
+
+        /// <inheritdoc />
+        public T? GetValue<T>(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            var value = GetPathNode(path);
+            if (value == null)
+                return default;
+
+            if (value.Type == JTokenType.Object || value.Type == JTokenType.Array)
+                return default;
+
+            return value!.Value<T>();
+        }
+
+        /// <inheritdoc />
+        public List<T?>? GetValues<T>(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            var value = GetPathNode(path);
+            if (value == null)
+                return default;
+
+            if (value.Type == JTokenType.Object)
+                return default;
+
+            return value!.Values<T>().ToList();
+        }
+
+        private JToken? GetPathNode(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            var currentToken = _token;
+            foreach (var node in path)
+            {
+                if (node.Type == 0)
+                {
+                    // Int value
+                    var val = node.Index!.Value;
+                    if (currentToken!.Type != JTokenType.Array || ((JArray)currentToken).Count <= val)
+                        return null;
+
+                    currentToken = currentToken[val];
+                }
+                else if (node.Type == 1)
+                {
+                    // String value
+                    if (currentToken!.Type != JTokenType.Object)
+                        return null;
+
+                    currentToken = currentToken[node.Property!];
+                }
+                else
+                {
+                    // Property name
+                    if (currentToken!.Type != JTokenType.Object)
+                        return null;
+
+                    currentToken = (currentToken.First as JProperty)?.Name;
+                }
+
+                if (currentToken == null)
+                    return null;
+            }
+
+            return currentToken;
+        }
+
+        /// <inheritdoc />
+        public abstract string GetOriginalString();
+
+        /// <inheritdoc />
+        public abstract void Clear();
+    }
+
+    /// <summary>
+    /// Json.Net stream message accessor
+    /// </summary>
+    public class JsonNetStreamMessageAccessor : JsonNetMessageAccessor, IStreamMessageAccessor
+    {
+        private Stream? _stream;
+
+        /// <inheritdoc />
+        public override bool OriginalDataAvailable => _stream?.CanSeek == true;
+
+        /// <inheritdoc />
+        public async Task<bool> Read(Stream stream, bool bufferStream)
+        {
+            if (bufferStream && stream is not MemoryStream)
+            {
+                // We need to be buffer the stream, and it's not currently a seekable stream, so copy it to a new memory stream
+                _stream = new MemoryStream();
+                stream.CopyTo(_stream);
+                _stream.Position = 0;
+            }
+            else if (bufferStream)
+            {
+                // We need to buffer the stream, and the current stream is seekable, store as is
+                _stream = stream;
+            }
+            else
+            {
+                // We don't need to buffer the stream, so don't bother keeping the reference
+            }
+
+            var readStream = _stream ?? stream;
+            var length = readStream.CanSeek ? readStream.Length : 4096;
+            using var reader = new StreamReader(readStream, Encoding.UTF8, false, (int)Math.Max(2, length), true);
+            using var jsonTextReader = new JsonTextReader(reader);
+
+            try
+            {
+                _token = await JToken.LoadAsync(jsonTextReader).ConfigureAwait(false);
+                IsJson = true;
+            }
+            catch (Exception)
+            {
+                // Not a json message
+                IsJson = false;
+            }
+
+            return IsJson;
+        }
+        /// <inheritdoc />
+        public override string GetOriginalString()
+        {
+            if (_stream is null)
+                throw new NullReferenceException("Stream not initialized");
+
+            _stream.Position = 0;
+            using var textReader = new StreamReader(_stream, Encoding.UTF8, false, 1024, true);
+            return textReader.ReadToEnd();
+        }
+
+        /// <inheritdoc />
+        public override void Clear()
+        {
+            _stream?.Dispose();
+            _stream = null;
+            _token = null;
+        }
+
+    }
+
+    /// <summary>
+    /// Json.Net byte message accessor
+    /// </summary>
+    public class JsonNetByteMessageAccessor : JsonNetMessageAccessor, IByteMessageAccessor
+    {
+        private ReadOnlyMemory<byte> _bytes;
+
+        /// <inheritdoc />
+        public bool Read(ReadOnlyMemory<byte> data)
+        {
+            _bytes = data;
+
+            // Try getting the underlying byte[] instead of the ToArray to prevent creating a copy
+            using var stream = MemoryMarshal.TryGetArray(data, out var arraySegment)
+                ? new MemoryStream(arraySegment.Array, arraySegment.Offset, arraySegment.Count)
+                : new MemoryStream(data.ToArray());
+            using var reader = new StreamReader(stream, Encoding.UTF8, false, Math.Max(2, data.Length), true);
+            using var jsonTextReader = new JsonTextReader(reader);
+
+            try
+            {
+                _token = JToken.Load(jsonTextReader);
+                IsJson = true;
+            }
+            catch (Exception)
+            {
+                // Not a json message
+                IsJson = false;
+            }
+
+            return IsJson;
+        }
+
+        /// <inheritdoc />
+        public override string GetOriginalString() =>
+            // Netstandard 2.0 doesn't support GetString from a ReadonlySpan<byte>, so use ToArray there instead
+#if NETSTANDARD2_0
+            Encoding.UTF8.GetString(_bytes.ToArray());
+#else
+            Encoding.UTF8.GetString(_bytes.Span);
+#endif
+
+        /// <inheritdoc />
+        public override bool OriginalDataAvailable => true;
+
+        /// <inheritdoc />
+        public override void Clear()
+        {
+            _bytes = null;
+            _token = null;
+        }
+    }
+}

CryptoExchange.Net/Converters/JsonNet/JsonNetMessageSerializer.cs

@@ -0,0 +1,12 @@
+using CryptoExchange.Net.Interfaces;
+using Newtonsoft.Json;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <inheritdoc />
+    public class JsonNetMessageSerializer : IMessageSerializer
+    {
+        /// <inheritdoc />
+        public string Serialize(object message) => JsonConvert.SerializeObject(message, Formatting.None);
+    }
+}

CryptoExchange.Net/Converters/JsonNet/SerializerOptions.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Globalization;
 
-namespace CryptoExchange.Net.Converters
+namespace CryptoExchange.Net.Converters.JsonNet
 {
     /// <summary>
     /// Serializer options

CryptoExchange.Net/Converters/MessageParsing/MessageNode.cs

@@ -0,0 +1,49 @@
+namespace CryptoExchange.Net.Converters.MessageParsing
+{
+    /// <summary>
+    /// Node accessor
+    /// </summary>
+    public struct NodeAccessor
+    {
+        /// <summary>
+        /// Index
+        /// </summary>
+        public int? Index { get; }
+        /// <summary>
+        /// Property name
+        /// </summary>
+        public string? Property { get; }
+
+        /// <summary>
+        /// Type (0 = int, 1 = string, 2 = prop name)
+        /// </summary>
+        public int Type { get; }
+
+        private NodeAccessor(int? index, string? property, int type)
+        {
+            Index = index;
+            Property = property;
+            Type = type;
+        }
+
+        /// <summary>
+        /// Create an int node accessor
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static NodeAccessor Int(int value) { return new NodeAccessor(value, null, 0); }
+
+        /// <summary>
+        /// Create a string node accessor
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static NodeAccessor String(string value) { return new NodeAccessor(null, value, 1); }
+
+        /// <summary>
+        /// Create a property name node accessor
+        /// </summary>
+        /// <returns></returns>
+        public static NodeAccessor PropertyName() { return new NodeAccessor(null, null, 2); }
+    }
+}

CryptoExchange.Net/Converters/MessageParsing/MessagePath.cs

@@ -0,0 +1,50 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace CryptoExchange.Net.Converters.MessageParsing
+{
+    /// <summary>
+    /// Message access definition
+    /// </summary>
+    public struct MessagePath : IEnumerable<NodeAccessor>
+    {
+        private List<NodeAccessor> _path;
+
+        internal void Add(NodeAccessor node)
+        {
+            _path.Add(node);
+        }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public MessagePath()
+        {
+            _path = new List<NodeAccessor>();
+        }
+
+        /// <summary>
+        /// Create a new message path
+        /// </summary>
+        /// <returns></returns>
+        public static MessagePath Get()
+        {
+            return new MessagePath();
+        }
+
+        /// <summary>
+        /// IEnumerable implementation
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerator<NodeAccessor> GetEnumerator()
+        {
+            for (var i = 0; i < _path.Count; i++)
+                yield return _path[i];
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}

CryptoExchange.Net/Converters/MessageParsing/MessagePathExtension.cs

@@ -0,0 +1,43 @@
+namespace CryptoExchange.Net.Converters.MessageParsing
+{
+    /// <summary>
+    /// Message path extension methods
+    /// </summary>
+    public static class MessagePathExtension
+    {
+        /// <summary>
+        /// Add a string node accessor
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="propName"></param>
+        /// <returns></returns>
+        public static MessagePath Property(this MessagePath path, string propName)
+        {
+            path.Add(NodeAccessor.String(propName));
+            return path;
+        }
+
+        /// <summary>
+        /// Add a property name node accessor
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static MessagePath PropertyName(this MessagePath path)
+        {
+            path.Add(NodeAccessor.PropertyName());
+            return path;
+        }
+
+        /// <summary>
+        /// Add a int node accessor
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="index"></param>
+        /// <returns></returns>
+        public static MessagePath Index(this MessagePath path, int index)
+        {
+            path.Add(NodeAccessor.Int(index));
+            return path;
+        }
+    }
+}

CryptoExchange.Net/Converters/MessageParsing/NodeType.cs

@@ -0,0 +1,21 @@
+namespace CryptoExchange.Net.Converters.MessageParsing
+{
+    /// <summary>
+    /// Message node type
+    /// </summary>
+    public enum NodeType
+    {
+        /// <summary>
+        /// Array node
+        /// </summary>
+        Array,
+        /// <summary>
+        /// Object node
+        /// </summary>
+        Object,
+        /// <summary>
+        /// Value node
+        /// </summary>
+        Value
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/ArrayConverter.cs

@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Concurrent;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Text.Json.Serialization;
+using System.Text.Json;
+using CryptoExchange.Net.Attributes;
+using System.Collections.Generic;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// Converter for arrays to objects. Can deserialize data like [0.1, 0.2, "test"] to an object. Mapping is done by marking the class with [JsonConverter(typeof(ArrayConverter))] and the properties
+    /// with [ArrayProperty(x)] where x is the index of the property in the array
+    /// </summary>
+    public class ArrayConverter : JsonConverterFactory
+    {
+        /// <inheritdoc />
+        public override bool CanConvert(Type typeToConvert) => true;
+
+        /// <inheritdoc />
+        public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+        {
+            Type converterType = typeof(ArrayConverterInner<>).MakeGenericType(typeToConvert);
+            return (JsonConverter)Activator.CreateInstance(converterType);
+        }
+
+        private class ArrayPropertyInfo
+        {
+            public PropertyInfo PropertyInfo { get; set; } = null!;
+            public ArrayPropertyAttribute ArrayProperty { get; set; } = null!;
+            public Type? JsonConverterType { get; set; }
+            public bool DefaultDeserialization { get; set; }
+        }
+
+        private class ArrayConverterInner<T> : JsonConverter<T>
+        {
+            private static readonly ConcurrentDictionary<Type, List<ArrayPropertyInfo>> _typeAttributesCache = new ConcurrentDictionary<Type, List<ArrayPropertyInfo>>();
+
+
+            public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+            {
+                // TODO
+                throw new NotImplementedException();
+            }
+
+            /// <inheritdoc />
+            public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            {
+                if (reader.TokenType == JsonTokenType.Null)
+                    return default;
+
+                var result = Activator.CreateInstance(typeToConvert);
+                return (T)ParseObject(ref reader, result, typeToConvert);
+            }
+
+            private static List<ArrayPropertyInfo> CacheTypeAttributes(Type type)
+            {
+                var attributes = new List<ArrayPropertyInfo>();
+                var properties = type.GetProperties();
+                foreach (var property in properties)
+                {
+                    var att = property.GetCustomAttribute<ArrayPropertyAttribute>();
+                    if (att == null)
+                        continue;
+
+                    attributes.Add(new ArrayPropertyInfo
+                    {
+                        ArrayProperty = att,
+                        PropertyInfo = property,
+                        DefaultDeserialization = property.GetCustomAttribute<JsonConversionAttribute>() != null,
+                        JsonConverterType = property.GetCustomAttribute<JsonConverterAttribute>()?.ConverterType
+                    });
+                }
+
+                _typeAttributesCache.TryAdd(type, attributes);
+                return attributes;
+            }
+
+            private static object ParseObject(ref Utf8JsonReader reader, object result, Type objectType)
+            {
+                if (reader.TokenType != JsonTokenType.StartArray)
+                    throw new Exception("1");
+
+                if (!_typeAttributesCache.TryGetValue(objectType, out var attributes))
+                    attributes = CacheTypeAttributes(objectType);
+
+                int index = 0;
+                while (reader.Read())
+                {
+                    if (reader.TokenType == JsonTokenType.EndArray)
+                        break;
+
+                var attribute = attributes.SingleOrDefault(a => a.ArrayProperty.Index == index);
+                var targetType = attribute.PropertyInfo.PropertyType;
+
+                    object? value = null;
+                    if (attribute.JsonConverterType != null)
+                    {
+                        // Has JsonConverter attribute
+                        var options = new JsonSerializerOptions();
+                        options.Converters.Add((JsonConverter)Activator.CreateInstance(attribute.JsonConverterType));
+                        value = JsonDocument.ParseValue(ref reader).Deserialize(targetType, options);
+                    }
+                    else if (attribute.DefaultDeserialization)
+                    {
+                        // Use default deserialization
+                        value = JsonDocument.ParseValue(ref reader).Deserialize(targetType);
+                    }
+                    else
+                    {
+                        value = reader.TokenType switch
+                        {
+                            JsonTokenType.Null => null,
+                            JsonTokenType.False => false,
+                            JsonTokenType.True => true,
+                            JsonTokenType.String => reader.GetString(),
+                            JsonTokenType.Number => reader.GetDecimal(),
+                            _ => throw new NotImplementedException($"Array deserialization of type {reader.TokenType} not supported"),
+                        };
+                    }
+
+                    attribute.PropertyInfo.SetValue(result, value == null ? null : Convert.ChangeType(value, attribute.PropertyInfo.PropertyType, CultureInfo.InvariantCulture));
+                    
+                    index++;
+                }
+
+                return result;
+            }
+        }
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/BoolConverter.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.Serialization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// Bool converter
+    /// </summary>
+    public class BoolConverter : JsonConverterFactory
+    {
+        /// <inheritdoc />
+        public override bool CanConvert(Type typeToConvert)
+        {
+            return typeToConvert == typeof(bool) || typeToConvert == typeof(bool?);
+        }
+
+        /// <inheritdoc />
+        public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+        {
+            Type converterType = typeof(BoolConverterInner<>).MakeGenericType(typeToConvert);
+            return (JsonConverter)Activator.CreateInstance(converterType);
+        }
+
+        private class BoolConverterInner<T> : JsonConverter<T>
+        {
+            public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+                => (T)((object?)ReadBool(ref reader, typeToConvert, options) ?? default(T))!;
+            
+            public bool? ReadBool(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            {
+                if (reader.TokenType == JsonTokenType.True)
+                    return true;
+
+                if (reader.TokenType == JsonTokenType.False)
+                    return false;
+
+                var value = reader.TokenType switch
+                {
+                    JsonTokenType.String => reader.GetString(),
+                    JsonTokenType.Number => reader.GetInt16().ToString(),
+                    _ => null
+                };
+
+                value = value?.ToLowerInvariant().Trim();
+                if (string.IsNullOrEmpty(value))
+                {
+                    if (typeToConvert == typeof(bool))
+                        Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received null bool value, but property type is not a nullable bool");
+                    return default;
+                }
+
+                switch (value)
+                {
+                    case "true":
+                    case "yes":
+                    case "y":
+                    case "1":
+                    case "on":
+                        return true;
+                    case "false":
+                    case "no":
+                    case "n":
+                    case "0":
+                    case "off":
+                    case "-1":
+                        return false;
+                }
+
+                throw new SerializationException($"Can't convert bool value {value}");
+            }
+
+            public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+            {
+                if (value is bool boolVal)
+                    writer.WriteBooleanValue(boolVal);
+                else
+                    writer.WriteNullValue();
+            }
+        }
+
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/DateTimeConverter.cs

@@ -0,0 +1,217 @@
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// Date time converter
+    /// </summary>
+    public class DateTimeConverter : JsonConverterFactory
+    {
+        private static readonly DateTime _epoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        private const long _ticksPerSecond = TimeSpan.TicksPerMillisecond * 1000;
+        private const double _ticksPerMicrosecond = TimeSpan.TicksPerMillisecond / 1000d;
+        private const double _ticksPerNanosecond = TimeSpan.TicksPerMillisecond / 1000d / 1000;
+
+        /// <inheritdoc />
+        public override bool CanConvert(Type typeToConvert)
+        {
+            return typeToConvert == typeof(DateTime) || typeToConvert == typeof(DateTime?);
+        }
+
+        /// <inheritdoc />
+        public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+        {
+            Type converterType = typeof(DateTimeConverterInner<>).MakeGenericType(typeToConvert);
+            return (JsonConverter)Activator.CreateInstance(converterType);
+        }
+
+        private class DateTimeConverterInner<T> : JsonConverter<T>
+        {
+            public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+                => (T)((object?)ReadDateTime(ref reader, typeToConvert, options) ?? default(T))!;
+
+            private DateTime? ReadDateTime(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            {
+                if (reader.TokenType == JsonTokenType.Null)
+                {
+                    if (typeToConvert == typeof(DateTime))
+                        Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | DateTime value of null, but property is not nullable");
+                    return default;
+                }
+
+                if (reader.TokenType is JsonTokenType.Number)
+                {
+                    var longValue = reader.GetDouble();
+                    if (longValue == 0 || longValue == -1)
+                        return default;
+                    if (longValue < 19999999999)
+                        return ConvertFromSeconds(longValue);
+                    if (longValue < 19999999999999)
+                        return ConvertFromMilliseconds(longValue);
+                    if (longValue < 19999999999999999)
+                        return ConvertFromMicroseconds(longValue);
+
+                    return ConvertFromNanoseconds(longValue);
+                }
+                else if (reader.TokenType is JsonTokenType.String)
+                {
+                    var stringValue = reader.GetString();
+                    if (string.IsNullOrWhiteSpace(stringValue)
+                        || stringValue == "-1"
+                        || double.TryParse(stringValue, out var doubleVal) && doubleVal == 0)
+                    {
+                        return default;
+                    }
+
+                    if (stringValue!.Length == 12 && stringValue.StartsWith("202"))
+                    {
+                        // Parse 202303261200 format
+                        if (!int.TryParse(stringValue.Substring(0, 4), out var year)
+                            || !int.TryParse(stringValue.Substring(4, 2), out var month)
+                            || !int.TryParse(stringValue.Substring(6, 2), out var day)
+                            || !int.TryParse(stringValue.Substring(8, 2), out var hour)
+                            || !int.TryParse(stringValue.Substring(10, 2), out var minute))
+                        {
+                            Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
+                            return default;
+                        }
+                        return new DateTime(year, month, day, hour, minute, 0, DateTimeKind.Utc);
+                    }
+
+                    if (stringValue.Length == 8)
+                    {
+                        // Parse 20211103 format
+                        if (!int.TryParse(stringValue.Substring(0, 4), out var year)
+                            || !int.TryParse(stringValue.Substring(4, 2), out var month)
+                            || !int.TryParse(stringValue.Substring(6, 2), out var day))
+                        {
+                            Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
+                            return default;
+                        }
+                        return new DateTime(year, month, day, 0, 0, 0, DateTimeKind.Utc);
+                    }
+
+                    if (stringValue.Length == 6)
+                    {
+                        // Parse 211103 format
+                        if (!int.TryParse(stringValue.Substring(0, 2), out var year)
+                            || !int.TryParse(stringValue.Substring(2, 2), out var month)
+                            || !int.TryParse(stringValue.Substring(4, 2), out var day))
+                        {
+                            Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
+                            return default;
+                        }
+                        return new DateTime(year + 2000, month, day, 0, 0, 0, DateTimeKind.Utc);
+                    }
+
+                    if (double.TryParse(stringValue, NumberStyles.Float, CultureInfo.InvariantCulture, out var doubleValue))
+                    {
+                        // Parse 1637745563.000 format
+                        if (doubleValue < 19999999999)
+                            return ConvertFromSeconds(doubleValue);
+                        if (doubleValue < 19999999999999)
+                            return ConvertFromMilliseconds((long)doubleValue);
+                        if (doubleValue < 19999999999999999)
+                            return ConvertFromMicroseconds((long)doubleValue);
+
+                        return ConvertFromNanoseconds((long)doubleValue);
+                    }
+
+                    if (stringValue.Length == 10)
+                    {
+                        // Parse 2021-11-03 format
+                        var values = stringValue.Split('-');
+                        if (!int.TryParse(values[0], out var year)
+                            || !int.TryParse(values[1], out var month)
+                            || !int.TryParse(values[2], out var day))
+                        {
+                            Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
+                            return default;
+                        }
+
+                        return new DateTime(year, month, day, 0, 0, 0, DateTimeKind.Utc);
+                    }
+
+                    return DateTime.Parse(stringValue, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal);
+                }
+                else
+                {
+                    return reader.GetDateTime();
+                }
+            }
+
+            public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+            {
+                if (value == null)
+                    writer.WriteNullValue();
+                else
+                {
+                    var dtValue = (DateTime)(object)value;
+                    if (dtValue == default)
+                        writer.WriteStringValue(default(DateTime));
+                    else
+                        writer.WriteNumberValue((long)Math.Round((dtValue - new DateTime(1970, 1, 1)).TotalMilliseconds));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Convert a seconds since epoch (01-01-1970) value to DateTime
+        /// </summary>
+        /// <param name="seconds"></param>
+        /// <returns></returns>
+        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>
+        /// <param name="milliseconds"></param>
+        /// <returns></returns>
+        public static DateTime ConvertFromMilliseconds(double milliseconds) => _epoch.AddTicks((long)Math.Round(milliseconds * TimeSpan.TicksPerMillisecond));
+        /// <summary>
+        /// Convert a microseconds since epoch (01-01-1970) value to DateTime
+        /// </summary>
+        /// <param name="microseconds"></param>
+        /// <returns></returns>
+        public static DateTime ConvertFromMicroseconds(double 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(double nanoseconds) => _epoch.AddTicks((long)Math.Round(nanoseconds * _ticksPerNanosecond));
+
+        /// <summary>
+        /// Convert a DateTime value to seconds since epoch (01-01-1970) value
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        [return: NotNullIfNotNull("time")]
+        public static long? ConvertToSeconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).TotalSeconds);
+        /// <summary>
+        /// Convert a DateTime value to milliseconds since epoch (01-01-1970) value
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        [return: NotNullIfNotNull("time")]
+        public static long? ConvertToMilliseconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).TotalMilliseconds);
+        /// <summary>
+        /// Convert a DateTime value to microseconds since epoch (01-01-1970) value
+        /// </summary>
+        /// <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);
+        /// <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);
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/DecimalConverter.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// Decimal converter
+    /// </summary>
+    public class DecimalConverter : JsonConverter<decimal?>
+    {
+        /// <inheritdoc />
+        public override decimal? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.Null)
+                return null;
+
+            if (reader.TokenType == JsonTokenType.String)
+            {
+                var value = reader.GetString();
+                if (string.IsNullOrEmpty(value))
+                    return null;
+
+                return decimal.Parse(value, NumberStyles.Float, CultureInfo.InvariantCulture);
+            }
+
+            return reader.GetDecimal();
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, decimal? value, JsonSerializerOptions options)
+        {
+            if (value == null)
+                writer.WriteNullValue();
+            else
+                writer.WriteNumberValue(value.Value);
+        }
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/DecimalStringWriterConverter.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// Converter for serializing decimal values as string
+    /// </summary>
+    public class DecimalStringWriterConverter : JsonConverter<decimal>
+    {
+        /// <inheritdoc />
+        public override decimal Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, decimal value, JsonSerializerOptions options)
+            => writer.WriteStringValue(value.ToString(CultureInfo.InvariantCulture) ?? null);
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs

@@ -0,0 +1,215 @@
+using CryptoExchange.Net.Attributes;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Reflection;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// Converter for enum values. Enums entries should be noted with a MapAttribute to map the enum value to a string value
+    /// </summary>
+    public class EnumConverter : JsonConverterFactory
+    {
+        private bool _warnOnMissingEntry = true;
+        private bool _writeAsInt;
+        private static readonly ConcurrentDictionary<Type, List<KeyValuePair<object, string>>> _mapping = new();
+
+        /// <summary>
+        /// </summary>
+        public EnumConverter() { }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="writeAsInt"></param>
+        /// <param name="warnOnMissingEntry"></param>
+        public EnumConverter(bool writeAsInt, bool warnOnMissingEntry)
+        {
+            _writeAsInt = writeAsInt;
+            _warnOnMissingEntry = warnOnMissingEntry;
+        }
+
+        /// <inheritdoc />
+        public override bool CanConvert(Type typeToConvert)
+        {
+            return typeToConvert.IsEnum || Nullable.GetUnderlyingType(typeToConvert)?.IsEnum == true;
+        }
+
+        /// <inheritdoc />
+        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+        {
+            JsonConverter converter = (JsonConverter)Activator.CreateInstance(
+                typeof(EnumConverterInner<>).MakeGenericType(
+                    new Type[] { typeToConvert }),
+                BindingFlags.Instance | BindingFlags.Public,
+                binder: null,
+                args: new object[] { _writeAsInt, _warnOnMissingEntry },
+                culture: null)!;
+
+            return converter;
+        }
+
+        private static List<KeyValuePair<object, string>> AddMapping(Type objectType)
+        {
+            var mapping = new List<KeyValuePair<object, string>>();
+            var enumMembers = objectType.GetMembers();
+            foreach (var member in enumMembers)
+            {
+                var maps = member.GetCustomAttributes(typeof(MapAttribute), false);
+                foreach (MapAttribute attribute in maps)
+                {
+                    foreach (var value in attribute.Values)
+                        mapping.Add(new KeyValuePair<object, string>(Enum.Parse(objectType, member.Name), value));
+                }
+            }
+            _mapping.TryAdd(objectType, mapping);
+            return mapping;
+        }
+
+        private class EnumConverterInner<T> : JsonConverter<T>
+        {
+            private bool _warnOnMissingEntry = true;
+            private bool _writeAsInt;
+
+            public EnumConverterInner(bool writeAsInt, bool warnOnMissingEntry)
+            {
+                _warnOnMissingEntry = warnOnMissingEntry;
+                _writeAsInt = writeAsInt;
+            }
+
+            public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            {
+                var enumType = Nullable.GetUnderlyingType(typeToConvert) ?? typeToConvert;
+                if (!_mapping.TryGetValue(enumType, out var mapping))
+                    mapping = AddMapping(enumType);
+
+                var stringValue = reader.TokenType switch
+                {
+                    JsonTokenType.String => reader.GetString(),
+                    JsonTokenType.Number => reader.GetInt16().ToString(),
+                    JsonTokenType.True => reader.GetBoolean().ToString(),
+                    JsonTokenType.False => reader.GetBoolean().ToString(),
+                    JsonTokenType.Null => null,
+                    _ => throw new Exception("Invalid token type for enum deserialization: " + reader.TokenType)
+                };
+
+                if (string.IsNullOrEmpty(stringValue))
+                {
+                    // Received null value
+                    var emptyResult = GetDefaultValue(typeToConvert, enumType);
+                    if (emptyResult != null)
+                        // If the property we're parsing to isn't nullable there isn't a correct way to return this as null will either throw an exception (.net framework) or the default enum value (dotnet core).
+                        Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received null enum value, but property type is not a nullable enum. EnumType: {enumType.Name}. If you think {enumType.Name} should be nullable please open an issue on the Github repo");
+
+                    return (T?)emptyResult;
+                }
+
+                if (!GetValue(enumType, mapping, stringValue!, out var result))
+                {
+                    var defaultValue = GetDefaultValue(typeToConvert, enumType);
+                    if (string.IsNullOrWhiteSpace(stringValue))
+                    {
+                        if (defaultValue != null)
+                            // We received an empty string and have no mapping for it, and the property isn't nullable
+                            Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received empty string as enum value, but property type is not a nullable enum. EnumType: {enumType.Name}. If you think {enumType.Name} should be nullable please open an issue on the Github repo");
+                    }
+                    else
+                    {
+                        // We received an enum value but weren't able to parse it.
+                        if (_warnOnMissingEntry)
+                            Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Cannot map enum value. EnumType: {enumType.Name}, Value: {stringValue}, Known values: {string.Join(", ", mapping.Select(m => m.Value))}. If you think {stringValue} should added please open an issue on the Github repo");
+                    }
+
+                    return (T?)defaultValue;
+                }
+
+                return (T?)result;
+            }
+
+            public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+            {
+                if (value == null)
+                {
+                    writer.WriteNullValue();
+                }
+                else
+                {
+                    if (!_writeAsInt)
+                    {
+                        var stringValue = GetString(value.GetType(), value);
+                        writer.WriteStringValue(stringValue);
+                    }
+                    else
+                    {
+                        writer.WriteNumberValue((int)Convert.ChangeType(value, typeof(int)));
+                    }
+                }
+            }
+
+            private static object? GetDefaultValue(Type objectType, Type enumType)
+            {
+                if (Nullable.GetUnderlyingType(objectType) != null)
+                    return null;
+
+                return Activator.CreateInstance(enumType); // return default value
+            }
+
+            private static bool GetValue(Type objectType, List<KeyValuePair<object, string>> enumMapping, string value, out object? result)
+            {
+                // Check for exact match first, then if not found fallback to a case insensitive match 
+                var mapping = enumMapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCulture));
+                if (mapping.Equals(default(KeyValuePair<object, string>)))
+                    mapping = enumMapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase));
+
+                if (!mapping.Equals(default(KeyValuePair<object, string>)))
+                {
+                    result = mapping.Key;
+                    return true;
+                }
+
+                try
+                {
+                    // If no explicit mapping is found try to parse string
+                    result = Enum.Parse(objectType, value, true);
+                    return true;
+                }
+                catch (Exception)
+                {
+                    result = default;
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="enumValue"></param>
+        /// <returns></returns>
+        [return: NotNullIfNotNull("enumValue")]
+        public static string? GetString<T>(T enumValue) => GetString(typeof(T), enumValue);
+
+        /// <summary>
+        /// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
+        /// </summary>
+        /// <param name="objectType"></param>
+        /// <param name="enumValue"></param>
+        /// <returns></returns>
+        [return: NotNullIfNotNull("enumValue")]
+        public static string? GetString(Type objectType, object? enumValue)
+        {
+            objectType = Nullable.GetUnderlyingType(objectType) ?? objectType;
+
+            if (!_mapping.TryGetValue(objectType, out var mapping))
+                mapping = AddMapping(objectType);
+
+            return enumValue == null ? null : (mapping.FirstOrDefault(v => v.Key.Equals(enumValue)).Value ?? enumValue.ToString());
+        }
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/SerializerOptions.cs

@@ -0,0 +1,27 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// Serializer options
+    /// </summary>
+    public static class SerializerOptions
+    {
+        /// <summary>
+        /// Json serializer settings which includes the EnumConverter, DateTimeConverter, BoolConverter and DecimalConverter
+        /// </summary>
+        public static JsonSerializerOptions WithConverters { get; } = new JsonSerializerOptions
+        {
+            NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.AllowNamedFloatingPointLiterals,
+            PropertyNameCaseInsensitive = false,
+            Converters =
+                    {
+                        new DateTimeConverter(),
+                        new EnumConverter(),
+                        new BoolConverter(),
+                        new DecimalConverter(),
+                    }
+        };
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageAccessor.cs

@@ -0,0 +1,289 @@
+using CryptoExchange.Net.Converters.MessageParsing;
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Objects;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// System.Text.Json message accessor
+    /// </summary>
+    public abstract class SystemTextJsonMessageAccessor : IMessageAccessor
+    {
+        /// <summary>
+        /// The JsonDocument loaded
+        /// </summary>
+        protected JsonDocument? _document;
+
+        private static JsonSerializerOptions _serializerOptions = SerializerOptions.WithConverters;
+
+        /// <inheritdoc />
+        public bool IsJson { get; set; }
+
+        /// <inheritdoc />
+        public abstract bool OriginalDataAvailable { get; }
+
+        /// <inheritdoc />
+        public object? Underlying => throw new NotImplementedException();
+
+        /// <inheritdoc />
+        public CallResult<object> Deserialize(Type type, MessagePath? path = null)
+        {
+            if (!IsJson)
+                return new CallResult<object>(GetOriginalString());
+
+            if (_document == null)
+                throw new InvalidOperationException("No json document loaded");
+
+            try
+            {
+                var result = _document.Deserialize(type, _serializerOptions);
+                return new CallResult<object>(result!);
+            }
+            catch (JsonException ex)
+            {
+                var info = $"Deserialize JsonException: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
+                return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+        }
+
+        /// <inheritdoc />
+        public CallResult<T> Deserialize<T>(MessagePath? path = null)
+        {
+            if (_document == null)
+                throw new InvalidOperationException("No json document loaded");
+
+            try
+            {
+                var result = _document.Deserialize<T>(_serializerOptions);
+                return new CallResult<T>(result!);
+            }
+            catch (JsonException ex)
+            {
+                var info = $"Deserialize JsonException: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
+                return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+        }
+
+        /// <inheritdoc />
+        public NodeType? GetNodeType()
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            if (_document == null)
+                throw new InvalidOperationException("No json document loaded");
+
+            return _document.RootElement.ValueKind switch
+            {
+                JsonValueKind.Object => NodeType.Object,
+                JsonValueKind.Array => NodeType.Array,
+                _ => NodeType.Value
+            };
+        }
+
+        /// <inheritdoc />
+        public NodeType? GetNodeType(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            var node = GetPathNode(path);
+            if (!node.HasValue)
+                return null;
+
+            return node.Value.ValueKind switch
+            {
+                JsonValueKind.Object => NodeType.Object,
+                JsonValueKind.Array => NodeType.Array,
+                _ => NodeType.Value
+            };
+        }
+
+        /// <inheritdoc />
+        public T? GetValue<T>(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            var value = GetPathNode(path);
+            if (value == null)
+                return default;
+
+            if (value.Value.ValueKind == JsonValueKind.Object || value.Value.ValueKind == JsonValueKind.Array)
+                return default;
+
+            return value.Value.Deserialize<T>();
+        }
+
+        /// <inheritdoc />
+        public List<T?>? GetValues<T>(MessagePath path) => throw new NotImplementedException();
+
+        private JsonElement? GetPathNode(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            if (_document == null)
+                throw new InvalidOperationException("No json document loaded");
+
+            JsonElement? currentToken = _document.RootElement;
+            foreach (var node in path)
+            {
+                if (node.Type == 0)
+                {
+                    // Int value
+                    var val = node.Index!.Value;
+                    if (currentToken!.Value.ValueKind != JsonValueKind.Array || currentToken.Value.GetArrayLength() <= val)
+                        return null;
+
+                    currentToken = currentToken.Value[val];
+                }
+                else if (node.Type == 1)
+                {
+                    // String value
+                    if (currentToken!.Value.ValueKind != JsonValueKind.Object)
+                        return null;
+
+                    if (!currentToken.Value.TryGetProperty(node.Property!, out var token))
+                        return null;
+                    currentToken = token;
+                }
+                else
+                {
+                    // Property name
+                    if (currentToken!.Value.ValueKind != JsonValueKind.Object)
+                        return null;
+
+                    throw new NotImplementedException();
+                }
+
+                if (currentToken == null)
+                    return null;
+            }
+
+            return currentToken;
+        }
+
+        /// <inheritdoc />
+        public abstract string GetOriginalString();
+
+        /// <inheritdoc />
+        public abstract void Clear();
+    }
+
+    /// <summary>
+    /// System.Text.Json stream message accessor
+    /// </summary>
+    public class SystemTextJsonStreamMessageAccessor : SystemTextJsonMessageAccessor, IStreamMessageAccessor
+    {
+        private Stream? _stream;
+
+        /// <inheritdoc />
+        public override bool OriginalDataAvailable => _stream?.CanSeek == true;
+
+        /// <inheritdoc />
+        public async Task<bool> Read(Stream stream, bool bufferStream)
+        {
+            if (bufferStream && stream is not MemoryStream)
+            {
+                // We need to be buffer the stream, and it's not currently a seekable stream, so copy it to a new memory stream
+                _stream = new MemoryStream();
+                stream.CopyTo(_stream);
+                _stream.Position = 0;
+            }
+            else if (bufferStream)
+            {
+                // We need to buffer the stream, and the current stream is seekable, store as is
+                _stream = stream;
+            }
+            else
+            {
+                // We don't need to buffer the stream, so don't bother keeping the reference
+            }
+
+            try
+            {
+                _document = await JsonDocument.ParseAsync(_stream ?? stream).ConfigureAwait(false);
+                IsJson = true;
+            }
+            catch (Exception)
+            {
+                // Not a json message
+                IsJson = false;
+            }
+
+            return IsJson;
+        }
+        /// <inheritdoc />
+        public override string GetOriginalString()
+        {
+            if (_stream is null)
+                throw new NullReferenceException("Stream not initialized");
+
+            _stream.Position = 0;
+            using var textReader = new StreamReader(_stream, Encoding.UTF8, false, 1024, true);
+            return textReader.ReadToEnd();
+        }
+
+        /// <inheritdoc />
+        public override void Clear()
+        {
+            _stream?.Dispose();
+            _stream = null;
+            _document = null;
+        }
+
+    }
+
+    /// <summary>
+    /// System.Text.Json byte message accessor
+    /// </summary>
+    public class SystemTextJsonByteMessageAccessor : SystemTextJsonMessageAccessor, IByteMessageAccessor
+    {
+        private ReadOnlyMemory<byte> _bytes;
+
+        /// <inheritdoc />
+        public bool Read(ReadOnlyMemory<byte> data)
+        {
+            _bytes = data;
+
+            try
+            {
+                _document = JsonDocument.Parse(data);
+                IsJson = true;
+            }
+            catch (Exception)
+            {
+                // Not a json message
+                IsJson = false;
+            }
+
+            return IsJson;
+        }
+
+        /// <inheritdoc />
+        public override string GetOriginalString() =>
+            // Netstandard 2.0 doesn't support GetString from a ReadonlySpan<byte>, so use ToArray there instead
+#if NETSTANDARD2_0
+            Encoding.UTF8.GetString(_bytes.ToArray());
+#else
+            Encoding.UTF8.GetString(_bytes.Span);
+#endif
+
+        /// <inheritdoc />
+        public override bool OriginalDataAvailable => true;
+
+        /// <inheritdoc />
+        public override void Clear()
+        {
+            _bytes = null;
+            _document = null;
+        }
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageSerializer.cs

@@ -0,0 +1,12 @@
+using CryptoExchange.Net.Interfaces;
+using System.Text.Json;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <inheritdoc />
+    public class SystemTextJsonMessageSerializer : IMessageSerializer
+    {
+        /// <inheritdoc />
+        public string Serialize(object message) => JsonSerializer.Serialize(message, SerializerOptions.WithConverters);
+    }
+}

CryptoExchange.Net/CryptoExchange.Net.csproj

@@ -5,21 +5,28 @@
   <PropertyGroup>
     <PackageId>CryptoExchange.Net</PackageId>
     <Authors>JKorf</Authors>
-    <Description>A base package for implementing cryptocurrency API's</Description>
-    <PackageVersion>6.2.0</PackageVersion>
-    <AssemblyVersion>6.2.0</AssemblyVersion>
-    <FileVersion>6.2.0</FileVersion>
+    <Description>CryptoExchange.Net is a base library which is used to implement different cryptocurrency (exchange) API's. It provides a standardized way of implementing different API's, which results in a very similar experience for users of the API implementations.</Description>
+    <PackageVersion>7.4.0</PackageVersion>
+    <AssemblyVersion>7.4.0</AssemblyVersion>
+    <FileVersion>7.4.0</FileVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageTags>OKX;OKX.Net;Mexc;Mexc.Net;Kucoin;Kucoin.Net;Kraken;Kraken.Net;Huobi;Huobi.Net;CoinEx;CoinEx.Net;Bybit;Bybit.Net;Bitget;Bitget.Net;Bitfinex;Bitfinex.Net;Binance;Binance.Net;CryptoCurrency;CryptoCurrency Exchange</PackageTags>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/JKorf/CryptoExchange.Net.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net</PackageProjectUrl>
     <NeutralLanguage>en</NeutralLanguage>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageIcon>icon.png</PackageIcon>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageReleaseNotes>6.2.0 - Added SerializerOptions helper class for setting a default serializer, Added ParameterCollection helper class for easier parameter definition, Added extra helper methods AuthenticationProvider, Remove interface entries meant for internal use, Added support for writing int values to the EnumConverter</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/JKorf/CryptoExchange.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="Icon\icon.png" Pack="true" PackagePath="\" />
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
   <PropertyGroup Label="Deterministic Build" Condition="'$(Configuration)' == 'Release'">
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
@@ -37,19 +44,20 @@
     <DocumentationFile>CryptoExchange.Net.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0">
+    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <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" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.32" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.32" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.3" />
   </ItemGroup>
 </Project>

CryptoExchange.Net/ExchangeHelpers.cs

@@ -1,5 +1,6 @@
 using CryptoExchange.Net.Objects;
 using System;
+using System.Security.Cryptography;
 
 namespace CryptoExchange.Net
 {
@@ -8,6 +9,8 @@ namespace CryptoExchange.Net
     /// </summary>
     public static class ExchangeHelpers
     {
+        private const string _allowedRandomChars = "ABCDEFGHIJKLMONOPQRSTUVWXYZabcdefghijklmonopqrstuvwxyz0123456789";
+
         /// <summary>
         /// The last used id, use NextId() to get the next id and up this
         /// </summary>
@@ -140,5 +143,53 @@ namespace CryptoExchange.Net
                 return _lastId;
             }
         }
+
+        /// <summary>
+        /// Return the last unique id that was generated
+        /// </summary>
+        /// <returns></returns>
+        public static int LastId()
+        {
+            lock (_idLock)
+                return _lastId;
+        }
+
+        /// <summary>
+        /// Generate a random string of specified length
+        /// </summary>
+        /// <param name="length">Length of the random string</param>
+        /// <returns></returns>
+        public static string RandomString(int length)
+        {
+            var randomChars = new char[length];
+
+#if NETSTANDARD2_1_OR_GREATER
+            for (int i = 0; i < length; i++)
+                randomChars[i] = _allowedRandomChars[RandomNumberGenerator.GetInt32(0, _allowedRandomChars.Length)];
+#else
+            var random = new Random();
+            for (int i = 0; i < length; i++)
+                randomChars[i] = _allowedRandomChars[random.Next(0, _allowedRandomChars.Length)];
+#endif
+
+            return new string(randomChars);
+        }
+
+        /// <summary>
+        /// Generate a random string of specified length
+        /// </summary>
+        /// <param name="source">The initial string</param>
+        /// <param name="totalLength">Total length of the resulting string</param>
+        /// <returns></returns>
+        public static string AppendRandomString(string source, int totalLength)
+        {
+            if (totalLength < source.Length)
+                throw new ArgumentException("Total length smaller than source string length", nameof(totalLength));
+
+            if (totalLength == source.Length)
+                return source;
+
+            return source + RandomString(totalLength - source.Length);
+        }
     }
 }

CryptoExchange.Net/ExtensionMethods.cs

@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
+using System.IO.Compression;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Text;
 using System.Web;
 using CryptoExchange.Net.Objects;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using System.Globalization;
 
 namespace CryptoExchange.Net
 {
@@ -29,18 +28,6 @@ namespace CryptoExchange.Net
             parameters.Add(key, value);
         }
 
-        /// <summary>
-        /// Add a parameter
-        /// </summary>
-        /// <param name="parameters"></param>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <param name="converter"></param>
-        public static void AddParameter(this Dictionary<string, object> parameters, string key, string value, JsonConverter converter)
-        {
-            parameters.Add(key, JsonConvert.SerializeObject(value, converter));
-        }
-
         /// <summary>
         /// Add a parameter
         /// </summary>
@@ -52,18 +39,6 @@ namespace CryptoExchange.Net
             parameters.Add(key, value);
         }
 
-        /// <summary>
-        /// Add a parameter
-        /// </summary>
-        /// <param name="parameters"></param>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <param name="converter"></param>
-        public static void AddParameter(this Dictionary<string, object> parameters, string key, object value, JsonConverter converter)
-        {
-            parameters.Add(key, JsonConvert.SerializeObject(value, converter));
-        }
-
         /// <summary>
         /// Add an optional parameter. Not added if value is null
         /// </summary>
@@ -76,19 +51,6 @@ namespace CryptoExchange.Net
                 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, object> parameters, string key, object? value, JsonConverter converter)
-        {
-            if (value != null)
-                parameters.Add(key, JsonConvert.SerializeObject(value, converter));
-        }
-
         /// <summary>
         /// Create a query string of the specified parameters
         /// </summary>
@@ -96,7 +58,7 @@ namespace CryptoExchange.Net
         /// <param name="urlEncodeValues">Whether or not the values should be url encoded</param>
         /// <param name="serializationType">How to serialize array parameters</param>
         /// <returns></returns>
-        public static string CreateParamString(this Dictionary<string, object> parameters, bool urlEncodeValues, ArrayParametersSerialization serializationType)
+        public static string CreateParamString(this IDictionary<string, object> parameters, bool urlEncodeValues, ArrayParametersSerialization serializationType)
         {
             var uriString = string.Empty;
             var arraysParameters = parameters.Where(p => p.Value.GetType().IsArray).ToList();
@@ -104,17 +66,22 @@ namespace CryptoExchange.Net
             {
                 if (serializationType == ArrayParametersSerialization.Array)
                 {
-                    uriString += $"{string.Join("&", ((object[])(urlEncodeValues ? Uri.EscapeDataString(arrayEntry.Value.ToString()) : arrayEntry.Value)).Select(v => $"{arrayEntry.Key}[]={v}"))}&";
+                    uriString += $"{string.Join("&", ((object[])(urlEncodeValues ? Uri.EscapeDataString(arrayEntry.Value.ToString()) : arrayEntry.Value)).Select(v => $"{arrayEntry.Key}[]={string.Format(CultureInfo.InvariantCulture, "{0}", v)}"))}&";
+                }
+                else if (serializationType == ArrayParametersSerialization.MultipleValues)
+                {
+                    var array = (Array)arrayEntry.Value;
+                    uriString += string.Join("&", array.OfType<object>().Select(a => $"{arrayEntry.Key}={Uri.EscapeDataString(string.Format(CultureInfo.InvariantCulture, "{0}", a))}"));
+                    uriString += "&";
                 }
                 else
                 {
                     var array = (Array)arrayEntry.Value;
-                    uriString += string.Join("&", array.OfType<object>().Select(a => $"{arrayEntry.Key}={Uri.EscapeDataString(a.ToString())}"));
-                    uriString += "&";
+                    uriString += $"{arrayEntry.Key}=[{string.Join(",", array.OfType<object>().Select(a => string.Format(CultureInfo.InvariantCulture, "{0}", a)))}]&";
                 }
             }
 
-            uriString += $"{string.Join("&", parameters.Where(p => !p.Value.GetType().IsArray).Select(s => $"{s.Key}={(urlEncodeValues ? Uri.EscapeDataString(s.Value.ToString()) : s.Value)}"))}";
+            uriString += $"{string.Join("&", parameters.Where(p => !p.Value.GetType().IsArray).Select(s => $"{s.Key}={(urlEncodeValues ? Uri.EscapeDataString(string.Format(CultureInfo.InvariantCulture, "{0}", s.Value)) : string.Format(CultureInfo.InvariantCulture, "{0}", s.Value))}"))}";
             uriString = uriString.TrimEnd('&');
             return uriString;
         }
@@ -124,7 +91,7 @@ namespace CryptoExchange.Net
         /// </summary>
         /// <param name="parameters"></param>
         /// <returns></returns>
-        public static string ToFormData(this SortedDictionary<string, object> parameters)
+        public static string ToFormData(this IDictionary<string, object> parameters)
         {
             var formData = HttpUtility.ParseQueryString(string.Empty);
             foreach (var kvp in parameters)
@@ -133,16 +100,15 @@ namespace CryptoExchange.Net
                 {
                     var array = (Array)kvp.Value;
                     foreach (var value in array)
-                        formData.Add(kvp.Key, value.ToString());
+                        formData.Add(kvp.Key, string.Format(CultureInfo.InvariantCulture, "{0}", value));
                 }
                 else
                 {
-                    formData.Add(kvp.Key, kvp.Value.ToString());
+                    formData.Add(kvp.Key, string.Format(CultureInfo.InvariantCulture, "{0}", kvp.Value));
                 }
             }
             return formData.ToString();
         }
-        
 
         /// <summary>
         /// Get the string the secure string is representing
@@ -230,37 +196,6 @@ namespace CryptoExchange.Net
             return secureString;
         }
 
-        /// <summary>
-        /// String to JToken
-        /// </summary>
-        /// <param name="stringData"></param>
-        /// <param name="logger"></param>
-        /// <returns></returns>
-        public static JToken? ToJToken(this string stringData, ILogger? logger = null)
-        {
-            if (string.IsNullOrEmpty(stringData))
-                return null;
-
-            try
-            {
-                return JToken.Parse(stringData);
-            }
-            catch (JsonReaderException jre)
-            {
-                var info = $"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}. Data: {stringData}";
-                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}";
-                logger?.Log(LogLevel.Error, info);
-                if (logger == null) Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | {info}");
-                return null;
-            }
-        }
-
         /// <summary>
         /// Validates an int is one of the allowed values
         /// </summary>
@@ -417,10 +352,26 @@ namespace CryptoExchange.Net
             var httpValueCollection = HttpUtility.ParseQueryString(string.Empty);
             foreach (var parameter in parameters)
             {
-                if(parameter.Value.GetType().IsArray)
+                if (parameter.Value.GetType().IsArray)
                 {
-                    foreach (var item in (object[])parameter.Value)
-                        httpValueCollection.Add(arraySerialization == ArrayParametersSerialization.Array ? parameter.Key + "[]" : parameter.Key, item.ToString());
+                    if (arraySerialization == ArrayParametersSerialization.JsonArray)
+                    {
+                        httpValueCollection.Add(parameter.Key, $"[{string.Join(",", (object[])parameter.Value)}]");
+                    }
+                    else
+                    {
+                        foreach (var item in (object[])parameter.Value)
+                        {
+                            if (arraySerialization == ArrayParametersSerialization.Array)
+                            {
+                                httpValueCollection.Add(parameter.Key + "[]", item.ToString());
+                            }
+                            else
+                            {
+                                httpValueCollection.Add(parameter.Key, item.ToString());
+                            }
+                        }
+                    }
                 }
                 else
                 {
@@ -450,8 +401,24 @@ namespace CryptoExchange.Net
             {
                 if (parameter.Value.GetType().IsArray)
                 {
-                    foreach (var item in (object[])parameter.Value)
-                        httpValueCollection.Add(arraySerialization == ArrayParametersSerialization.Array ? parameter.Key + "[]" : parameter.Key, item.ToString());
+                    if (arraySerialization == ArrayParametersSerialization.JsonArray)
+                    {
+                        httpValueCollection.Add(parameter.Key, $"[{string.Join(",", (object[])parameter.Value)}]");
+                    }
+                    else
+                    {
+                        foreach (var item in (object[])parameter.Value)
+                        {
+                            if (arraySerialization == ArrayParametersSerialization.Array)
+                            {
+                                httpValueCollection.Add(parameter.Key + "[]", item.ToString());
+                            }
+                            else
+                            {
+                                httpValueCollection.Add(parameter.Key, item.ToString());
+                            }
+                        }
+                    }
                 }
                 else
                 {
@@ -481,6 +448,22 @@ namespace CryptoExchange.Net
 
             return ub.Uri;
         }
+
+        /// <summary>
+        /// Decompress using Gzip
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public static ReadOnlyMemory<byte> DecompressGzip(this ReadOnlyMemory<byte> data)
+        {
+            using var decompressedStream = new MemoryStream();
+            using var dataStream = MemoryMarshal.TryGetArray(data, out var arraySegment)
+                ? new MemoryStream(arraySegment.Array, arraySegment.Offset, arraySegment.Count)
+                : new MemoryStream(data.ToArray());
+            using var deflateStream = new GZipStream(new MemoryStream(data.ToArray()), CompressionMode.Decompress);
+            deflateStream.CopyTo(decompressedStream);
+            return new ReadOnlyMemory<byte>(decompressedStream.GetBuffer(), 0, (int)decompressedStream.Length);
+        }
     }
 }
 

CryptoExchange.Net/Interfaces/CommonClients/IFuturesClient.cs

@@ -2,7 +2,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using CryptoExchange.Net.CommonObjects;
-using CryptoExchange.Net.Interfaces.CommonClients;
 using CryptoExchange.Net.Objects;
 
 namespace CryptoExchange.Net.Interfaces.CommonClients

CryptoExchange.Net/Interfaces/CommonClients/ISpotClient.cs

@@ -1,5 +1,4 @@
 using CryptoExchange.Net.CommonObjects;
-using CryptoExchange.Net.Interfaces.CommonClients;
 using CryptoExchange.Net.Objects;
 using System.Threading;
 using System.Threading.Tasks;

CryptoExchange.Net/Interfaces/IBaseApiClient.cs

@@ -12,6 +12,14 @@ namespace CryptoExchange.Net.Interfaces
         /// </summary>
         string BaseAddress { get; }
 
+        /// <summary>
+        /// Format a base and quote asset to an exchange accepted symbol 
+        /// </summary>
+        /// <param name="baseAsset">The base asset</param>
+        /// <param name="quoteAsset">The quote asset</param>
+        /// <returns></returns>
+        string FormatSymbol(string baseAsset, string quoteAsset);
+
         /// <summary>
         /// Set the API credentials for this API client
         /// </summary>

CryptoExchange.Net/Interfaces/ICryptoRestClient.cs

@@ -0,0 +1,32 @@
+using CryptoExchange.Net.Interfaces.CommonClients;
+using System;
+using System.Collections.Generic;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Client for accessing REST API's for different exchanges
+    /// </summary>
+    public interface ICryptoRestClient
+    {
+        /// <summary>
+        /// Get a list of all registered common ISpotClient types
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<ISpotClient> GetSpotClients();
+
+        /// <summary>
+        /// Get an ISpotClient implementation by exchange name
+        /// </summary>
+        /// <param name="exchangeName"></param>
+        /// <returns></returns>
+        ISpotClient? SpotClient(string exchangeName);
+
+        /// <summary>
+        /// Try get 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        T TryGet<T>(Func<T> createFunc);
+    }
+}

CryptoExchange.Net/Interfaces/ICryptoSocketClient.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Client for accessing Websocket API's for different exchanges
+    /// </summary>
+    public interface ICryptoSocketClient
+    {
+        /// <summary>
+        /// Try get a client by type for the service collection
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        T TryGet<T>(Func<T> createFunc);
+    }
+}

CryptoExchange.Net/Interfaces/IMessageAccessor.cs

@@ -0,0 +1,101 @@
+using CryptoExchange.Net.Converters.MessageParsing;
+using CryptoExchange.Net.Objects;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Message accessor
+    /// </summary>
+    public interface IMessageAccessor
+    {
+        /// <summary>
+        /// Is this a json message
+        /// </summary>
+        bool IsJson { get; }
+        /// <summary>
+        /// Is the original data available for retrieval
+        /// </summary>
+        bool OriginalDataAvailable { get; }
+        /// <summary>
+        /// The underlying data object
+        /// </summary>
+        object? Underlying { get; }
+        /// <summary>
+        /// Clear internal data structure
+        /// </summary>
+        void Clear();
+        /// <summary>
+        /// Get the type of node
+        /// </summary>
+        /// <returns></returns>
+        NodeType? GetNodeType();
+        /// <summary>
+        /// Get the type of node
+        /// </summary>
+        /// <param name="path">Access path</param>
+        /// <returns></returns>
+        NodeType? GetNodeType(MessagePath path);
+        /// <summary>
+        /// Get the value of a path
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        T? GetValue<T>(MessagePath path);
+        /// <summary>
+        /// Get the values of an array
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        List<T?>? GetValues<T>(MessagePath path);
+        /// <summary>
+        /// Deserialize the message into this type
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        CallResult<object> Deserialize(Type type, MessagePath? path = null);
+        /// <summary>
+        /// Deserialize the message into this type
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        CallResult<T> Deserialize<T>(MessagePath? path = null);
+
+        /// <summary>
+        /// Get the original string value
+        /// </summary>
+        /// <returns></returns>
+        string GetOriginalString();
+    }
+
+    /// <summary>
+    /// Stream message accessor
+    /// </summary>
+    public interface IStreamMessageAccessor : IMessageAccessor
+    {
+        /// <summary>
+        /// Load a stream message
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="bufferStream"></param>
+        Task<bool> Read(Stream stream, bool bufferStream);
+    }
+
+    /// <summary>
+    /// Byte message accessor
+    /// </summary>
+    public interface IByteMessageAccessor : IMessageAccessor
+    {
+        /// <summary>
+        /// Load a data message
+        /// </summary>
+        /// <param name="data"></param>
+        bool Read(ReadOnlyMemory<byte> data);
+    }
+}

CryptoExchange.Net/Interfaces/IMessageProcessor.cs

@@ -0,0 +1,47 @@
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Sockets;
+using System;
+using System.Collections.Generic;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Message processor
+    /// </summary>
+    public interface IMessageProcessor
+    {
+        /// <summary>
+        /// Id of the processor
+        /// </summary>
+        public int Id { get; }
+        /// <summary>
+        /// Whether this listener can handle data
+        /// </summary>
+        public bool CanHandleData { get; }
+        /// <summary>
+        /// The identifiers for this processor
+        /// </summary>
+        public HashSet<string> ListenerIdentifiers { get; }
+        /// <summary>
+        /// Handle a message
+        /// </summary>
+        /// <param name="connection"></param>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        CallResult Handle(SocketConnection connection, DataEvent<object> message);
+        /// <summary>
+        /// Get the type the message should be deserialized to
+        /// </summary>
+        /// <param name="messageAccessor"></param>
+        /// <returns></returns>
+        Type? GetMessageType(IMessageAccessor messageAccessor);
+        /// <summary>
+        /// Deserialize a message into object of type
+        /// </summary>
+        /// <param name="accessor"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        CallResult<object> Deserialize(IMessageAccessor accessor, Type type);
+    }
+}

CryptoExchange.Net/Interfaces/IMessageSerializer.cs

@@ -0,0 +1,15 @@
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Serializer interface
+    /// </summary>
+    public interface IMessageSerializer
+    {
+        /// <summary>
+        /// Serialize an object to a string
+        /// </summary>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        string Serialize(object message);
+    }
+}

CryptoExchange.Net/Interfaces/IOrderBookFactory.cs

@@ -0,0 +1,27 @@
+using CryptoExchange.Net.Objects.Options;
+using System;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Factory for ISymbolOrderBook instances
+    /// </summary>
+    public interface IOrderBookFactory<TOptions> where TOptions : OrderBookOptions
+    {
+        /// <summary>
+        /// Create a new order book by symbol name
+        /// </summary>
+        /// <param name="symbol">Symbol name</param>
+        /// <param name="options">Options for the order book</param>
+        /// <returns></returns>
+        public ISymbolOrderBook Create(string symbol, Action<TOptions>? options = null);
+        /// <summary>
+        /// Create a new order book by base and quote asset names
+        /// </summary>
+        /// <param name="baseAsset">Base asset name</param>
+        /// <param name="quoteAsset">Quote asset name</param>
+        /// <param name="options">Options for the order book</param>
+        /// <returns></returns>
+        public ISymbolOrderBook Create(string baseAsset, string quoteAsset, Action<TOptions>? options = null);
+    }
+}

CryptoExchange.Net/Interfaces/IRequestFactory.cs

@@ -1,5 +1,4 @@
 using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Objects.Options;
 using System;
 using System.Net.Http;
 

CryptoExchange.Net/Interfaces/IRestApiClient.cs

@@ -1,7 +1,4 @@
-using CryptoExchange.Net.Objects;
-using System;
-
-namespace CryptoExchange.Net.Interfaces
+namespace CryptoExchange.Net.Interfaces
 {
     /// <summary>
     /// Base rest API client

CryptoExchange.Net/Interfaces/IRestClient.cs

@@ -1,6 +1,4 @@
 using System;
-using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
 
 namespace CryptoExchange.Net.Interfaces
@@ -19,5 +17,10 @@ namespace CryptoExchange.Net.Interfaces
         /// The total amount of requests made with this client
         /// </summary>
         int TotalRequestsMade { get; }
+
+        /// <summary>
+        /// The exchange name
+        /// </summary>
+        string Exchange { get; }
     }
 }

CryptoExchange.Net/Interfaces/ISocketApiClient.cs

@@ -1,7 +1,5 @@
-using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Objects.Options;
-using CryptoExchange.Net.Sockets;
-using System;
+using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.Objects.Sockets;
 using System.Threading.Tasks;
 
 namespace CryptoExchange.Net.Interfaces
@@ -28,9 +26,17 @@ namespace CryptoExchange.Net.Interfaces
         /// </summary>
         IWebsocketFactory SocketFactory { get; set; }
         /// <summary>
+        /// Current client options
+        /// </summary>
+        SocketExchangeOptions ClientOptions { get; }
+        /// <summary>
+        /// Current API options
+        /// </summary>
+        SocketApiOptions ApiOptions { get; }
+        /// <summary>
         /// Log the current state of connections and subscriptions
         /// </summary>
-        string GetSubscriptionsState();
+        string GetSubscriptionsState(bool includeSubDetails = true);
         /// <summary>
         /// Reconnect all connections
         /// </summary>

CryptoExchange.Net/Interfaces/ISocketClient.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
-using CryptoExchange.Net.Sockets;
+using CryptoExchange.Net.Objects.Sockets;
 
 namespace CryptoExchange.Net.Interfaces
 {
@@ -12,6 +10,11 @@ namespace CryptoExchange.Net.Interfaces
     /// </summary>
     public interface ISocketClient: IDisposable
     {
+        /// <summary>
+        /// The exchange name
+        /// </summary>
+        string Exchange { get; }
+
         /// <summary>
         /// The options provided for this client
         /// </summary>

CryptoExchange.Net/Interfaces/ISymbolOrderBook.cs

@@ -12,9 +12,14 @@ namespace CryptoExchange.Net.Interfaces
     public interface ISymbolOrderBook
     {
         /// <summary>
-        /// Identifier
+        /// The exchange the book is for
         /// </summary>
-        string Id { get; }
+        string Exchange { get; }
+
+        /// <summary>
+        /// The Api the book is for
+        /// </summary>
+        string Api { get; }
 
         /// <summary>
         /// The status of the order book. Order book is up to date when the status is `Synced`

CryptoExchange.Net/Interfaces/IWebsocket.cs

@@ -1,8 +1,6 @@
 using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Sockets;
 using System;
-using System.Security.Authentication;
-using System.Text;
+using System.Net.WebSockets;
 using System.Threading.Tasks;
 
 namespace CryptoExchange.Net.Interfaces
@@ -15,31 +13,35 @@ namespace CryptoExchange.Net.Interfaces
         /// <summary>
         /// Websocket closed event
         /// </summary>
-        event Action OnClose;
+        event Func<Task> OnClose;
         /// <summary>
         /// Websocket message received event
         /// </summary>
-        event Action<string> OnMessage;
+        event Action<WebSocketMessageType, ReadOnlyMemory<byte>> OnStreamMessage;
         /// <summary>
         /// Websocket sent event, RequestId as parameter
         /// </summary>
-        event Action<int> OnRequestSent;
+        event Func<int, Task> OnRequestSent;
+        /// <summary>
+        /// Websocket query was ratelimited and couldn't be send
+        /// </summary>
+        event Func<int, Task>? OnRequestRateLimited;
         /// <summary>
         /// Websocket error event
         /// </summary>
-        event Action<Exception> OnError;
+        event Func<Exception, Task> OnError;
         /// <summary>
         /// Websocket opened event
         /// </summary>
-        event Action OnOpen;
+        event Func<Task> OnOpen;
         /// <summary>
         /// Websocket has lost connection to the server and is attempting to reconnect
         /// </summary>
-        event Action OnReconnecting;
+        event Func<Task> OnReconnecting;
         /// <summary>
         /// Websocket has reconnected to the server
         /// </summary>
-        event Action OnReconnected;
+        event Func<Task> OnReconnected;
         /// <summary>
         /// Get reconntion url
         /// </summary>
@@ -69,7 +71,7 @@ namespace CryptoExchange.Net.Interfaces
         /// Connect the socket
         /// </summary>
         /// <returns></returns>
-        Task<bool> ConnectAsync();
+        Task<CallResult> ConnectAsync();
         /// <summary>
         /// Send data
         /// </summary>

CryptoExchange.Net/Interfaces/IWebsocketFactory.cs

@@ -1,4 +1,4 @@
-using CryptoExchange.Net.Sockets;
+using CryptoExchange.Net.Objects.Sockets;
 using Microsoft.Extensions.Logging;
 
 namespace CryptoExchange.Net.Interfaces

CryptoExchange.Net/Logging/Extensions/CryptoExchangeWebSocketClientLoggingExtension.cs

@@ -0,0 +1,336 @@
+using Microsoft.Extensions.Logging;
+using System;
+
+namespace CryptoExchange.Net.Logging.Extensions
+{
+    internal static class CryptoExchangeWebSocketClientLoggingExtension
+    {
+        private static readonly Action<ILogger, int, Exception?> _connecting;
+        private static readonly Action<ILogger, int, string, Exception?> _connectionFailed;
+        private static readonly Action<ILogger, int, Uri, Exception?> _connected;
+        private static readonly Action<ILogger, int, Exception?> _startingProcessing;
+        private static readonly Action<ILogger, int, Exception?> _finishedProcessing;
+        private static readonly Action<ILogger, int, Exception?> _attemptReconnect;
+        private static readonly Action<ILogger, int, Uri, Exception?> _setReconnectUri;
+        private static readonly Action<ILogger, int, int, int, Exception?> _addingBytesToSendBuffer;
+        private static readonly Action<ILogger, int, Exception?> _reconnectRequested;
+        private static readonly Action<ILogger, int, Exception?> _closeAsyncWaitingForExistingCloseTask;
+        private static readonly Action<ILogger, int, Exception?> _closeAsyncSocketNotOpen;
+        private static readonly Action<ILogger, int, Exception?> _closing;
+        private static readonly Action<ILogger, int, Exception?> _closed;
+        private static readonly Action<ILogger, int, Exception?> _disposing;
+        private static readonly Action<ILogger, int, Exception?> _disposed;
+        private static readonly Action<ILogger, int, int, int, Exception?> _sentBytes;
+        private static readonly Action<ILogger, int, string, Exception?> _sendLoopStoppedWithException;
+        private static readonly Action<ILogger, int, Exception?> _sendLoopFinished;
+        private static readonly Action<ILogger, int, string, string ,Exception?> _receivedCloseMessage;
+        private static readonly Action<ILogger, int, int, Exception?> _receivedPartialMessage;
+        private static readonly Action<ILogger, int, int, Exception?> _receivedSingleMessage;
+        private static readonly Action<ILogger, int, long, Exception?> _reassembledMessage;
+        private static readonly Action<ILogger, int, long, Exception?> _discardIncompleteMessage;
+        private static readonly Action<ILogger, int, Exception?> _receiveLoopStoppedWithException;
+        private static readonly Action<ILogger, int, Exception?> _receiveLoopFinished;
+        private static readonly Action<ILogger, int, TimeSpan?, Exception?> _startingTaskForNoDataReceivedCheck;
+        private static readonly Action<ILogger, int, TimeSpan?, Exception?> _noDataReceiveTimoutReconnect;
+
+        static CryptoExchangeWebSocketClientLoggingExtension()
+        {
+            _connecting = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1000, "Connecting"),
+                "[Sckt {SocketId}] connecting");
+
+            _connectionFailed = LoggerMessage.Define<int, string>(
+                LogLevel.Error,
+                new EventId(1001, "ConnectionFailed"),
+                "[Sckt {SocketId}] connection failed: {ErrorMessage}");
+
+            _connected = LoggerMessage.Define<int, Uri?>(
+                LogLevel.Debug,
+                new EventId(1002, "Connected"),
+                "[Sckt {SocketId}] connected to {Uri}");
+
+            _startingProcessing = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1003, "StartingProcessing"),
+                "[Sckt {SocketId}] starting processing tasks");
+
+            _finishedProcessing = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1004, "FinishedProcessing"),
+                "[Sckt {SocketId}] processing tasks finished");
+
+            _attemptReconnect = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1005, "AttemptReconnect"),
+                "[Sckt {SocketId}] attempting to reconnect");
+
+            _setReconnectUri = LoggerMessage.Define<int, Uri>(
+                LogLevel.Debug,
+                new EventId(1006, "SetReconnectUri"),
+                "[Sckt {SocketId}] reconnect URI set to {ReconnectUri}");
+
+            _addingBytesToSendBuffer = LoggerMessage.Define<int, int, int>(
+                LogLevel.Trace,
+                new EventId(1007, "AddingBytesToSendBuffer"),
+                "[Sckt {SocketId}] [Req {RequestId}] adding {NumBytes} bytes to send buffer");
+
+            _reconnectRequested = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1008, "ReconnectRequested"),
+                "[Sckt {SocketId}] reconnect requested");
+
+            _closeAsyncWaitingForExistingCloseTask = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1009, "CloseAsyncWaitForExistingCloseTask"),
+                "[Sckt {SocketId}] CloseAsync() waiting for existing close task");
+
+            _closeAsyncSocketNotOpen = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1010, "CloseAsyncSocketNotOpen"),
+                "[Sckt {SocketId}] CloseAsync() socket not open");
+
+            _closing = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1011, "Closing"),
+               "[Sckt {SocketId}] closing");
+
+            _closed = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1012, "Closed"),
+                "[Sckt {SocketId}] closed");
+
+            _disposing = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1013, "Disposing"),
+                "[Sckt {SocketId}] disposing");
+
+            _disposed = LoggerMessage.Define<int>(
+                LogLevel.Trace,
+                new EventId(1014, "Disposed"),
+                "[Sckt {SocketId}] disposed");
+
+            _sentBytes = LoggerMessage.Define<int, int, int>(
+                LogLevel.Trace,
+                new EventId(1016, "SentBytes"),
+                "[Sckt {SocketId}] [Req {RequestId}] sent {NumBytes} bytes");
+
+            _sendLoopStoppedWithException = LoggerMessage.Define<int, string>(
+                LogLevel.Warning,
+                new EventId(1017, "SendLoopStoppedWithException"),
+                "[Sckt {SocketId}] send loop stopped with exception: {ErrorMessage}");
+
+            _sendLoopFinished = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1018, "SendLoopFinished"),
+                "[Sckt {SocketId}] send loop finished");
+
+            _receivedCloseMessage = LoggerMessage.Define<int, string, string>(
+                LogLevel.Debug,
+                new EventId(1019, "ReceivedCloseMessage"),
+                "[Sckt {SocketId}] received `Close` message, CloseStatus: {CloseStatus}, CloseStatusDescription: {CloseStatusDescription}");
+
+            _receivedPartialMessage = LoggerMessage.Define<int, int>(
+                LogLevel.Trace,
+                new EventId(1020, "ReceivedPartialMessage"),
+                "[Sckt {SocketId}] received {NumBytes} bytes in partial message");
+
+            _receivedSingleMessage = LoggerMessage.Define<int, int>(
+                LogLevel.Trace,
+                new EventId(1021, "ReceivedSingleMessage"),
+                "[Sckt {SocketId}] received {NumBytes} bytes in single message");
+
+            _reassembledMessage = LoggerMessage.Define<int, long>(
+                LogLevel.Trace,
+                new EventId(1022, "ReassembledMessage"),
+                "[Sckt {SocketId}] reassembled message of {NumBytes} bytes");
+
+            _discardIncompleteMessage = LoggerMessage.Define<int, long>(
+                LogLevel.Trace,
+                new EventId(1023, "DiscardIncompleteMessage"),
+                "[Sckt {SocketId}] discarding incomplete message of {NumBytes} bytes");
+
+            _receiveLoopStoppedWithException = LoggerMessage.Define<int>(
+                LogLevel.Warning,
+                new EventId(1024, "ReceiveLoopStoppedWithException"),
+                "[Sckt {SocketId}] receive loop stopped with exception");
+
+            _receiveLoopFinished = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(1025, "ReceiveLoopFinished"),
+                "[Sckt {SocketId}] receive loop finished");
+
+            _startingTaskForNoDataReceivedCheck = LoggerMessage.Define<int, TimeSpan?>(
+                LogLevel.Debug,
+                new EventId(1026, "StartingTaskForNoDataReceivedCheck"),
+                "[Sckt {SocketId}] starting task checking for no data received for {Timeout}");
+
+            _noDataReceiveTimoutReconnect = LoggerMessage.Define<int, TimeSpan?>(
+                LogLevel.Debug,
+                new EventId(1027, "NoDataReceiveTimeoutReconnect"),
+                "[Sckt {SocketId}] no data received for {Timeout}, reconnecting socket");
+        }
+
+        public static void SocketConnecting(
+            this ILogger logger, int socketId)
+        {
+            _connecting(logger, socketId, null);
+        }
+
+        public static void SocketConnectionFailed(
+            this ILogger logger, int socketId, string message, Exception e)
+        {
+            _connectionFailed(logger, socketId, message, e);
+        }
+
+        public static void SocketConnected(
+            this ILogger logger, int socketId, Uri uri)
+        {
+            _connected(logger, socketId, uri, null);
+        }
+
+        public static void SocketStartingProcessing(
+            this ILogger logger, int socketId)
+        {
+            _startingProcessing(logger, socketId, null);
+        }
+
+        public static void SocketFinishedProcessing(
+            this ILogger logger, int socketId)
+        {
+            _finishedProcessing(logger, socketId, null);
+        }
+
+        public static void SocketAttemptReconnect(
+            this ILogger logger, int socketId)
+        {
+            _attemptReconnect(logger, socketId, null);
+        }
+
+        public static void SocketSetReconnectUri(
+            this ILogger logger, int socketId, Uri uri)
+        {
+            _setReconnectUri(logger, socketId, uri, null);
+        }
+
+        public static void SocketAddingBytesToSendBuffer(
+            this ILogger logger, int socketId, int requestId, byte[] bytes)
+        {
+            _addingBytesToSendBuffer(logger, socketId, requestId, bytes.Length, null);
+        }
+
+        public static void SocketReconnectRequested(
+            this ILogger logger, int socketId)
+        {
+            _reconnectRequested(logger, socketId, null);
+        }
+
+        public static void SocketCloseAsyncWaitingForExistingCloseTask(
+            this ILogger logger, int socketId)
+        {
+            _closeAsyncWaitingForExistingCloseTask(logger, socketId, null);
+        }
+
+        public static void SocketCloseAsyncSocketNotOpen(
+            this ILogger logger, int socketId)
+        {
+            _closeAsyncSocketNotOpen(logger, socketId, null);
+        }
+
+        public static void SocketClosing(
+            this ILogger logger, int socketId)
+        {
+            _closing(logger, socketId, null);
+        }
+
+        public static void SocketClosed(
+            this ILogger logger, int socketId)
+        {
+            _closed(logger, socketId, null);
+        }
+
+        public static void SocketDisposing(
+            this ILogger logger, int socketId)
+        {
+            _disposing(logger, socketId, null);
+        }
+
+        public static void SocketDisposed(
+            this ILogger logger, int socketId)
+        {
+            _disposed(logger, socketId, null);
+        }
+
+        public static void SocketSentBytes(
+            this ILogger logger, int socketId, int requestId, int numBytes)
+        {
+            _sentBytes(logger, socketId, requestId, numBytes, null);
+        }
+
+        public static void SocketSendLoopStoppedWithException(
+            this ILogger logger, int socketId, string message, Exception e)
+        {
+            _sendLoopStoppedWithException(logger, socketId, message, e);
+        }
+
+        public static void SocketSendLoopFinished(
+            this ILogger logger, int socketId)
+        {
+            _sendLoopFinished(logger, socketId, null);
+        }
+
+        public static void SocketReceivedCloseMessage(
+            this ILogger logger, int socketId, string webSocketCloseStatus, string closeStatusDescription)
+        {
+            _receivedCloseMessage(logger, socketId, webSocketCloseStatus, closeStatusDescription, null);
+        }
+
+        public static void SocketReceivedPartialMessage(
+            this ILogger logger, int socketId, int countBytes)
+        {
+            _receivedPartialMessage(logger, socketId, countBytes, null);
+        }
+
+        public static void SocketReceivedSingleMessage(
+            this ILogger logger, int socketId, int countBytes)
+        {
+            _receivedSingleMessage(logger, socketId, countBytes, null);
+        }
+
+        public static void SocketReassembledMessage(
+            this ILogger logger, int socketId, long countBytes)
+        {
+            _reassembledMessage(logger, socketId, countBytes, null);
+        }
+
+        public static void SocketDiscardIncompleteMessage(
+            this ILogger logger, int socketId, long countBytes)
+        {
+            _discardIncompleteMessage(logger, socketId, countBytes, null);
+        }
+
+        public static void SocketReceiveLoopStoppedWithException(
+            this ILogger logger, int socketId, Exception e)
+        {
+            _receiveLoopStoppedWithException(logger, socketId, e);
+        }
+
+        public static void SocketReceiveLoopFinished(
+            this ILogger logger, int socketId)
+        {
+            _receiveLoopFinished(logger, socketId, null);
+        }
+
+        public static void SocketStartingTaskForNoDataReceivedCheck(
+            this ILogger logger, int socketId, TimeSpan? timeSpan)
+        {
+            _startingTaskForNoDataReceivedCheck(logger, socketId, timeSpan, null);
+        }
+
+        public static void SocketNoDataReceiveTimoutReconnect(
+            this ILogger logger, int socketId, TimeSpan? timeSpan)
+        {
+            _noDataReceiveTimoutReconnect(logger, socketId, timeSpan, null);
+        }
+    }
+}

CryptoExchange.Net/Logging/Extensions/RateLimitGateLoggingExtensions.cs

@@ -0,0 +1,78 @@
+using Microsoft.Extensions.Logging;
+using System;
+
+namespace CryptoExchange.Net.Logging.Extensions
+{
+    internal static class RateLimitGateLoggingExtensions
+    {
+        private static readonly Action<ILogger, int, string, string, string, Exception?> _rateLimitRequestFailed;
+        private static readonly Action<ILogger, int, string, string, Exception?> _rateLimitConnectionFailed;
+        private static readonly Action<ILogger, int, string, TimeSpan, string, string, Exception?> _rateLimitDelayingRequest;
+        private static readonly Action<ILogger, int, TimeSpan, string, string, Exception?> _rateLimitDelayingConnection;
+        private static readonly Action<ILogger, int, string, string, string, int, Exception?> _rateLimitAppliedRequest;
+        private static readonly Action<ILogger, int, string, string, int, Exception?> _rateLimitAppliedConnection;
+
+        static RateLimitGateLoggingExtensions()
+        {
+            _rateLimitRequestFailed = LoggerMessage.Define<int, string, string, string>(
+                LogLevel.Warning,
+                new EventId(6000, "RateLimitRequestFailed"),
+                "[Req {Id}] Call to {Path} failed because of ratelimit guard {Guard}; {Limit}");
+
+            _rateLimitConnectionFailed = LoggerMessage.Define<int, string, string>(
+                LogLevel.Warning,
+                new EventId(6001, "RateLimitConnectionFailed"),
+                "[Sckt {Id}] Connection failed because of ratelimit guard {Guard}; {Limit}");
+
+            _rateLimitDelayingRequest = LoggerMessage.Define<int, string, TimeSpan, string, string>(
+                LogLevel.Warning,
+                new EventId(6002, "RateLimitDelayingRequest"),
+                "[Req {Id}] Delaying call to {Path} by {Delay} because of ratelimit guard {Guard}; {Limit}");
+
+            _rateLimitDelayingConnection = LoggerMessage.Define<int, TimeSpan, string, string>(
+                LogLevel.Warning,
+                new EventId(6003, "RateLimitDelayingConnection"),
+                "[Sckt {Id}] Delaying connection by {Delay} because of ratelimit guard {Guard}; {Limit}");
+
+            _rateLimitAppliedConnection = LoggerMessage.Define<int, string, string, int>(
+                LogLevel.Trace,
+                new EventId(6004, "RateLimitDelayingConnection"),
+                "[Sckt {Id}] Connection passed ratelimit guard {Guard}; {Limit}, New count: {Current}");
+
+            _rateLimitAppliedRequest = LoggerMessage.Define<int, string, string, string, int>(
+                LogLevel.Trace,
+                new EventId(6005, "RateLimitAppliedRequest"),
+                "[Req {Id}] Call to {Path} passed ratelimit guard {Guard}; {Limit}, New count: {Current}");
+        }
+
+        public static void RateLimitRequestFailed(this ILogger logger, int requestId, string path, string guard, string limit)
+        {
+            _rateLimitRequestFailed(logger, requestId, path, guard, limit, null);
+        }
+
+        public static void RateLimitConnectionFailed(this ILogger logger, int connectionId, string guard, string limit)
+        {
+            _rateLimitConnectionFailed(logger, connectionId, guard, limit, null);
+        }
+
+        public static void RateLimitDelayingRequest(this ILogger logger, int requestId, string path, TimeSpan delay, string guard, string limit)
+        {
+            _rateLimitDelayingRequest(logger, requestId, path, delay, guard, limit, null);
+        }
+
+        public static void RateLimitDelayingConnection(this ILogger logger, int connectionId, TimeSpan delay, string guard, string limit)
+        {
+            _rateLimitDelayingConnection(logger, connectionId, delay, guard, limit, null);
+        }
+
+        public static void RateLimitAppliedConnection(this ILogger logger, int connectionId, string guard, string limit, int current)
+        {
+            _rateLimitAppliedConnection(logger, connectionId, guard, limit, current, null);
+        }
+
+        public static void RateLimitAppliedRequest(this ILogger logger, int requestIdId, string path, string guard, string limit, int current)
+        {
+            _rateLimitAppliedRequest(logger, requestIdId, path, guard, limit, current, null);
+        }
+    }
+}

CryptoExchange.Net/Logging/Extensions/RestApiClientLoggingExtensions.cs

@@ -0,0 +1,115 @@
+using CryptoExchange.Net.Objects;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Net;
+using System.Net.Http;
+
+namespace CryptoExchange.Net.Logging.Extensions
+{
+    internal static class RestApiClientLoggingExtensions
+    {
+        private static readonly Action<ILogger, int?, int?, long, string?, Exception?> _restApiErrorReceived;
+        private static readonly Action<ILogger, int?, int?, long, string?, Exception?> _restApiResponseReceived;
+        private static readonly Action<ILogger, int, string, Exception?> _restApiFailedToSyncTime;
+        private static readonly Action<ILogger, int, string, Exception?> _restApiNoApiCredentials;
+        private static readonly Action<ILogger, int, Uri, Exception?> _restApiCreatingRequest;
+        private static readonly Action<ILogger, int, HttpMethod, string, Uri, string, Exception?> _restApiSendingRequest;
+        private static readonly Action<ILogger, int, DateTime, Exception?> _restApiRateLimitRetry;
+        private static readonly Action<ILogger, int, DateTime, Exception?> _restApiRateLimitPauseUntil;
+        private static readonly Action<ILogger, int, RequestDefinition, string?, string, string, Exception?> _restApiSendRequest;
+
+
+        static RestApiClientLoggingExtensions()
+        {
+            _restApiErrorReceived = LoggerMessage.Define<int?, int?, long, string?>(
+                LogLevel.Warning,
+                new EventId(4000, "RestApiErrorReceived"),
+                "[Req {RequestId}] {ResponseStatusCode} - Error received in {ResponseTime}ms: {ErrorMessage}");
+
+            _restApiResponseReceived = LoggerMessage.Define<int?, int?, long, string?>(
+                LogLevel.Debug,
+                new EventId(4001, "RestApiResponseReceived"),
+                "[Req {RequestId}] {ResponseStatusCode} - Response received in {ResponseTime}ms: {OriginalData}");
+
+            _restApiFailedToSyncTime = LoggerMessage.Define<int, string>(
+                LogLevel.Debug,
+                new EventId(4002, "RestApifailedToSyncTime"),
+                "[Req {RequestId}] Failed to sync time, aborting request: {ErrorMessage}");
+
+            _restApiNoApiCredentials = LoggerMessage.Define<int, string>(
+                LogLevel.Warning,
+                new EventId(4003, "RestApiNoApiCredentials"),
+                "[Req {RequestId}] Request {RestApiUri} failed because no ApiCredentials were provided");
+
+            _restApiCreatingRequest = LoggerMessage.Define<int, Uri>(
+                LogLevel.Information,
+                new EventId(4004, "RestApiCreatingRequest"),
+                "[Req {RequestId}] Creating request for {RestApiUri}");
+
+            _restApiSendingRequest = LoggerMessage.Define<int, HttpMethod, string, Uri, string>(
+                LogLevel.Trace,
+                new EventId(4005, "RestApiSendingRequest"),
+                "[Req {RequestId}] Sending {Method} {Signed} request to {RestApiUri}{Query}");
+
+            _restApiRateLimitRetry = LoggerMessage.Define<int, DateTime>(
+                LogLevel.Warning,
+                new EventId(4006, "RestApiRateLimitRetry"),
+                "[Req {RequestId}] Received ratelimit error, retrying after {Timestamp}");
+
+            _restApiRateLimitPauseUntil = LoggerMessage.Define<int, DateTime>(
+                LogLevel.Warning,
+                new EventId(4007, "RestApiRateLimitPauseUntil"),
+                "[Req {RequestId}] Ratelimit error from server, pausing requests until {Until}");
+
+            _restApiSendRequest = LoggerMessage.Define<int, RequestDefinition, string?, string, string>(
+                LogLevel.Debug,
+                new EventId(4008, "RestApiSendRequest"),
+                "[Req {RequestId}] Sending {Definition} request with body {Body}, query parameters {Query} and headers {Headers}");
+        }
+
+        public static void RestApiErrorReceived(this ILogger logger, int? requestId, HttpStatusCode? responseStatusCode, long responseTime, string? error)
+        {
+            _restApiErrorReceived(logger, requestId, (int?)responseStatusCode, responseTime, error, null);
+        }
+
+        public static void RestApiResponseReceived(this ILogger logger, int? requestId, HttpStatusCode? responseStatusCode, long responseTime, string? originalData)
+        {
+            _restApiResponseReceived(logger, requestId, (int?)responseStatusCode, responseTime, originalData, null);
+        }
+
+        public static void RestApiFailedToSyncTime(this ILogger logger, int requestId, string error)
+        {
+            _restApiFailedToSyncTime(logger, requestId, error, null);
+        }
+
+        public static void RestApiNoApiCredentials(this ILogger logger, int requestId, string uri)
+        {
+            _restApiNoApiCredentials(logger, requestId, uri, null);
+        }
+
+        public static void RestApiCreatingRequest(this ILogger logger, int requestId, Uri uri)
+        {
+            _restApiCreatingRequest(logger, requestId, uri, null);
+        }
+
+        public static void RestApiSendingRequest(this ILogger logger, int requestId, HttpMethod method, string signed, Uri uri, string paramString)
+        {
+            _restApiSendingRequest(logger, requestId, method, signed, uri, paramString, null);
+        }
+
+        public static void RestApiRateLimitRetry(this ILogger logger, int requestId, DateTime retryAfter)
+        {
+            _restApiRateLimitRetry(logger, requestId, retryAfter, null);
+        }
+
+        public static void RestApiRateLimitPauseUntil(this ILogger logger, int requestId, DateTime retryAfter)
+        {
+            _restApiRateLimitPauseUntil(logger, requestId, retryAfter, null);
+        }
+
+        public static void RestApiSendRequest(this ILogger logger, int requestId, RequestDefinition definition, string? body, string query, string headers)
+        {
+            _restApiSendRequest(logger, requestId, definition, body, query, headers, null);
+        }
+    }
+}

CryptoExchange.Net/Logging/Extensions/SocketApiClientLoggingExtension.cs

@@ -0,0 +1,188 @@
+using Microsoft.Extensions.Logging;
+using System;
+
+namespace CryptoExchange.Net.Logging.Extensions
+{
+    internal static class SocketApiClientLoggingExtension
+    {
+        private static readonly Action<ILogger, int, Exception?> _failedToAddSubscriptionRetryOnDifferentConnection;
+        private static readonly Action<ILogger, int, Exception?> _hasBeenPausedCantSubscribeAtThisMoment;
+        private static readonly Action<ILogger, int, string?, Exception?> _failedToSubscribe;
+        private static readonly Action<ILogger, int, int, Exception?> _cancellationTokenSetClosingSubscription;
+        private static readonly Action<ILogger, int, int, Exception?> _subscriptionCompletedSuccessfully;
+        private static readonly Action<ILogger, int, Exception?> _hasBeenPausedCantSendQueryAtThisMoment;
+        private static readonly Action<ILogger, int, Exception?> _attemptingToAuthenticate;
+        private static readonly Action<ILogger, int, Exception?> _authenticationFailed;
+        private static readonly Action<ILogger, int, Exception?> _authenticated;
+        private static readonly Action<ILogger, string?, Exception?> _failedToDetermineConnectionUrl;
+        private static readonly Action<ILogger, string, Exception?> _connectionAddressSetTo;
+        private static readonly Action<ILogger, int, string, Exception?> _socketCreatedForAddress;
+        private static readonly Action<ILogger, int, Exception?> _unsubscribingAll;
+        private static readonly Action<ILogger, Exception?> _disposingSocketClient;
+        private static readonly Action<ILogger, int, int, Exception?> _unsubscribingSubscription;
+        private static readonly Action<ILogger, int, Exception?> _reconnectingAllConnections;
+
+        static SocketApiClientLoggingExtension()
+        {
+            _failedToAddSubscriptionRetryOnDifferentConnection = LoggerMessage.Define<int>(
+                LogLevel.Trace,
+                new EventId(3000, "FailedToAddSubscriptionRetryOnDifferentConnection"),
+                "[Sckt {SocketId}] failed to add subscription, retrying on different connection");
+
+            _hasBeenPausedCantSubscribeAtThisMoment = LoggerMessage.Define<int>(
+                LogLevel.Warning,
+                new EventId(3001, "HasBeenPausedCantSubscribeAtThisMoment"),
+                "[Sckt {SocketId}] has been paused, can't subscribe at this moment");
+
+            _failedToSubscribe = LoggerMessage.Define<int, string?>(
+                LogLevel.Warning,
+                new EventId(3002, "FailedToSubscribe"),
+                "[Sckt {SocketId}] failed to subscribe: {ErrorMessage}");
+
+            _cancellationTokenSetClosingSubscription = LoggerMessage.Define<int, int>(
+                LogLevel.Information,
+                new EventId(3003, "CancellationTokenSetClosingSubscription"),
+                "[Sckt {SocketId}] Cancellation token set, closing subscription {SubscriptionId}");
+
+            _subscriptionCompletedSuccessfully = LoggerMessage.Define<int, int>(
+                LogLevel.Information,
+                new EventId(3004, "SubscriptionCompletedSuccessfully"),
+                "[Sckt {SocketId}] subscription {SubscriptionId} completed successfully");
+
+            _hasBeenPausedCantSendQueryAtThisMoment = LoggerMessage.Define<int>(
+                LogLevel.Warning,
+                new EventId(3005, "HasBeenPausedCantSendQueryAtThisMoment"),
+                "[Sckt {SocketId}] has been paused, can't send query at this moment");
+
+            _attemptingToAuthenticate = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(3006, "AttemptingToAuthenticate"),
+                "[Sckt {SocketId}] Attempting to authenticate");
+
+            _authenticationFailed = LoggerMessage.Define<int>(
+                LogLevel.Warning,
+                new EventId(3007, "AuthenticationFailed"),
+                "[Sckt {SocketId}] authentication failed");
+
+            _authenticated = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(3008, "Authenticated"),
+                "[Sckt {SocketId}] authenticated");
+
+            _failedToDetermineConnectionUrl = LoggerMessage.Define<string?>(
+                LogLevel.Warning,
+                new EventId(3009, "FailedToDetermineConnectionUrl"),
+                "Failed to determine connection url: {ErrorMessage}");
+
+            _connectionAddressSetTo = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                new EventId(3010, "ConnectionAddressSetTo"),
+                "Connection address set to {ConnectionAddress}");
+
+            _socketCreatedForAddress = LoggerMessage.Define<int, string>(
+                LogLevel.Debug,
+                new EventId(3011, "SocketCreatedForAddress"),
+                "[Sckt {SocketId}] created for {Address}");
+
+            _unsubscribingAll = LoggerMessage.Define<int>(
+                LogLevel.Information,
+                new EventId(3013, "UnsubscribingAll"),
+                "Unsubscribing all {SubscriptionCount} subscriptions");
+
+            _disposingSocketClient = LoggerMessage.Define(
+                LogLevel.Debug,
+                new EventId(3015, "DisposingSocketClient"),
+                "Disposing socket client, closing all subscriptions");
+
+            _unsubscribingSubscription = LoggerMessage.Define<int, int>(
+                LogLevel.Information,
+                new EventId(3016, "UnsubscribingSubscription"),
+                "[Sckt {SocketId}] Unsubscribing subscription {SubscriptionId}");
+
+            _reconnectingAllConnections = LoggerMessage.Define<int>(
+                LogLevel.Information,
+                new EventId(3017, "ReconnectingAll"),
+                "Reconnecting all {ConnectionCount} connections");
+        }
+
+        public static void FailedToAddSubscriptionRetryOnDifferentConnection(this ILogger logger, int socketId)
+        {
+            _failedToAddSubscriptionRetryOnDifferentConnection(logger, socketId, null);
+        }
+
+        public static void HasBeenPausedCantSubscribeAtThisMoment(this ILogger logger, int socketId)
+        {
+            _hasBeenPausedCantSubscribeAtThisMoment(logger, socketId, null);
+        }
+
+        public static void FailedToSubscribe(this ILogger logger, int socketId, string? error)
+        {
+            _failedToSubscribe(logger, socketId, error, null);
+        }
+
+        public static void CancellationTokenSetClosingSubscription(this ILogger logger, int socketId, int subscriptionId)
+        {
+            _cancellationTokenSetClosingSubscription(logger, socketId, subscriptionId, null);
+        }
+
+        public static void SubscriptionCompletedSuccessfully(this ILogger logger, int socketId, int subscriptionId)
+        {
+            _subscriptionCompletedSuccessfully(logger, socketId, subscriptionId, null);
+        }
+
+        public static void HasBeenPausedCantSendQueryAtThisMoment(this ILogger logger, int socketId)
+        {
+            _hasBeenPausedCantSendQueryAtThisMoment(logger, socketId, null);
+        }
+
+        public static void AttemptingToAuthenticate(this ILogger logger, int socketId)
+        {
+            _attemptingToAuthenticate(logger, socketId, null);
+        }
+
+        public static void AuthenticationFailed(this ILogger logger, int socketId)
+        {
+            _authenticationFailed(logger, socketId, null);
+        }
+
+        public static void Authenticated(this ILogger logger, int socketId)
+        {
+            _authenticated(logger, socketId, null);
+        }
+
+        public static void FailedToDetermineConnectionUrl(this ILogger logger, string? error)
+        {
+            _failedToDetermineConnectionUrl(logger, error, null);
+        }
+
+        public static void ConnectionAddressSetTo(this ILogger logger, string connectionAddress)
+        {
+            _connectionAddressSetTo(logger, connectionAddress, null);
+        }
+
+        public static void SocketCreatedForAddress(this ILogger logger, int socketId, string address)
+        {
+            _socketCreatedForAddress(logger, socketId, address, null);
+        }
+
+        public static void UnsubscribingAll(this ILogger logger, int subscriptionCount)
+        {
+            _unsubscribingAll(logger, subscriptionCount, null);
+        }
+
+        public static void DisposingSocketClient(this ILogger logger)
+        {
+            _disposingSocketClient(logger, null);
+        }
+
+        public static void UnsubscribingSubscription(this ILogger logger, int socketId, int subscriptionId)
+        {
+            _unsubscribingSubscription(logger, socketId, subscriptionId, null);
+        }
+
+        public static void ReconnectingAllConnections(this ILogger logger, int connectionCount)
+        {
+            _reconnectingAllConnections(logger, connectionCount, null);
+        }
+    }
+}

CryptoExchange.Net/Logging/Extensions/SocketConnectionLoggingExtension.cs

@@ -0,0 +1,324 @@
+using System;
+using System.Net.WebSockets;
+using Microsoft.Extensions.Logging;
+
+namespace CryptoExchange.Net.Logging.Extensions
+{
+    internal static class SocketConnectionLoggingExtension
+    {
+        private static readonly Action<ILogger, int, bool, Exception?> _activityPaused;
+        private static readonly Action<ILogger, int, Sockets.SocketConnection.SocketStatus, Sockets.SocketConnection.SocketStatus, Exception?> _socketStatusChanged;
+        private static readonly Action<ILogger, int, string?, Exception?> _failedReconnectProcessing;
+        private static readonly Action<ILogger, int, Exception?> _unkownExceptionWhileProcessingReconnection;
+        private static readonly Action<ILogger, int, WebSocketError, string?, Exception?> _webSocketErrorCodeAndDetails;
+        private static readonly Action<ILogger, int, string?, Exception?> _webSocketError;
+        private static readonly Action<ILogger, int, int, Exception?> _messageSentNotPending;
+        private static readonly Action<ILogger, int, string, Exception?> _receivedData;
+        private static readonly Action<ILogger, int, string, Exception?> _failedToEvaluateMessage;
+        private static readonly Action<ILogger, int, Exception?> _errorProcessingMessage;
+        private static readonly Action<ILogger, int, int, string, Exception?> _processorMatched;
+        private static readonly Action<ILogger, int, int, Exception?> _receivedMessageNotRecognized;
+        private static readonly Action<ILogger, int, string?, Exception?> _failedToDeserializeMessage;
+        private static readonly Action<ILogger, int, string, Exception?> _userMessageProcessingFailed;
+        private static readonly Action<ILogger, int, long, long, Exception?> _messageProcessed;
+        private static readonly Action<ILogger, int, int, Exception?> _closingSubscription;
+        private static readonly Action<ILogger, int, Exception?> _notUnsubscribingSubscriptionBecauseDuplicateRunning;
+        private static readonly Action<ILogger, int, Exception?> _alreadyClosing;
+        private static readonly Action<ILogger, int, Exception?> _closingNoMoreSubscriptions;
+        private static readonly Action<ILogger, int, int, int, Exception?> _addingNewSubscription;
+        private static readonly Action<ILogger, int, Exception?> _nothingToResubscribeCloseConnection;
+        private static readonly Action<ILogger, int, Exception?> _failedAuthenticationDisconnectAndRecoonect;
+        private static readonly Action<ILogger, int, Exception?> _authenticationSucceeded;
+        private static readonly Action<ILogger, int, string?, Exception?> _failedRequestRevitalization;
+        private static readonly Action<ILogger, int, Exception?> _allSubscriptionResubscribed;
+        private static readonly Action<ILogger, int, int, Exception?> _subscriptionUnsubscribed;
+        private static readonly Action<ILogger, int, string, Exception?> _sendingPeriodic;
+        private static readonly Action<ILogger, int, string, string, Exception?> _periodicSendFailed;
+        private static readonly Action<ILogger, int, int, string, Exception?> _sendingData;
+        private static readonly Action<ILogger, int, string, string, Exception?> _receivedMessageNotMatchedToAnyListener;
+
+        static SocketConnectionLoggingExtension()
+        {
+            _activityPaused = LoggerMessage.Define<int, bool>(
+                LogLevel.Information,
+                new EventId(2000, "ActivityPaused"),
+                "[Sckt {SocketId}] paused activity: {Paused}");
+
+            _socketStatusChanged = LoggerMessage.Define<int, Sockets.SocketConnection.SocketStatus, Sockets.SocketConnection.SocketStatus>(
+                LogLevel.Debug,
+                new EventId(2001, "SocketStatusChanged"),
+                "[Sckt {SocketId}] status changed from {OldStatus} to {NewStatus}");
+
+            _failedReconnectProcessing = LoggerMessage.Define<int, string?>(
+                LogLevel.Warning,
+                new EventId(2002, "FailedReconnectProcessing"),
+                "[Sckt {SocketId}] failed reconnect processing: {ErrorMessage}, reconnecting again");
+
+            _unkownExceptionWhileProcessingReconnection = LoggerMessage.Define<int>(
+                LogLevel.Warning,
+                new EventId(2003, "UnkownExceptionWhileProcessingReconnection"),
+                "[Sckt {SocketId}] Unknown exception while processing reconnection, reconnecting again");
+
+            _webSocketErrorCodeAndDetails = LoggerMessage.Define<int, WebSocketError, string?>(
+                LogLevel.Warning,
+                new EventId(2004, "WebSocketErrorCode"),
+                "[Sckt {SocketId}] error: Websocket error code {WebSocketErrorCdoe}, details: {Details}");
+
+            _webSocketError = LoggerMessage.Define<int, string?>(
+                LogLevel.Warning,
+                new EventId(2005, "WebSocketError"),
+                "[Sckt {SocketId}] error: {ErrorMessage}");
+
+            _messageSentNotPending = LoggerMessage.Define<int, int>(
+                LogLevel.Debug,
+                new EventId(2006, "MessageSentNotPending"),
+                "[Sckt {SocketId}] [Req {RequestId}] message sent, but not pending");
+
+            _receivedData = LoggerMessage.Define<int, string>(
+                LogLevel.Trace,
+                new EventId(2007, "ReceivedData"),
+                "[Sckt {SocketId}] received {OriginalData}");
+
+            _failedToEvaluateMessage = LoggerMessage.Define<int, string>(
+                LogLevel.Warning,
+                new EventId(2008, "FailedToEvaluateMessage"),
+                "[Sckt {SocketId}] failed to evaluate message. {OriginalData}");
+
+            _errorProcessingMessage = LoggerMessage.Define<int>(
+                LogLevel.Error,
+                new EventId(2009, "ErrorProcessingMessage"),
+                "[Sckt {SocketId}] error processing message");
+
+            _processorMatched = LoggerMessage.Define<int, int, string>(
+                LogLevel.Trace,
+                new EventId(2010, "ProcessorMatched"),
+                "[Sckt {SocketId}] {Count} processor(s) matched to message with listener identifier {ListenerId}");
+
+            _receivedMessageNotRecognized = LoggerMessage.Define<int, int>(
+                LogLevel.Warning,
+                new EventId(2011, "ReceivedMessageNotRecognized"),
+                "[Sckt {SocketId}] received message not recognized by handler {ProcessorId}");
+
+            _failedToDeserializeMessage = LoggerMessage.Define<int, string?>(
+                LogLevel.Warning,
+                new EventId(2012, "FailedToDeserializeMessage"),
+                "[Sckt {SocketId}] deserialization failed: {ErrorMessage}");
+
+            _userMessageProcessingFailed = LoggerMessage.Define<int, string>(
+                LogLevel.Warning,
+                new EventId(2013, "UserMessageProcessingFailed"),
+                "[Sckt {SocketId}] user message processing failed: {ErrorMessage}");
+
+            _messageProcessed = LoggerMessage.Define<int, long, long>(
+                LogLevel.Trace,
+                new EventId(2014, "MessageProcessed"),
+                "[Sckt {SocketId}] message processed in {ProcessingTime}ms, {ParsingTime}ms parsing");
+
+            _closingSubscription = LoggerMessage.Define<int, int>(
+                LogLevel.Debug,
+                new EventId(2015, "ClosingSubscription"),
+                "[Sckt {SocketId}] closing subscription {SubscriptionId}");
+
+            _notUnsubscribingSubscriptionBecauseDuplicateRunning = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(2016, "NotUnsubscribingSubscription"),
+                "[Sckt {SocketId}] not unsubscribing subscription as there is still a duplicate subscription running");
+
+            _alreadyClosing = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(2017, "AlreadyClosing"),
+                "[Sckt {SocketId}] already closing");
+
+            _closingNoMoreSubscriptions = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(2018, "ClosingNoMoreSubscriptions"),
+                "[Sckt {SocketId}] closing as there are no more subscriptions");
+
+            _addingNewSubscription = LoggerMessage.Define<int, int, int>(
+                LogLevel.Debug,
+                new EventId(2019, "AddingNewSubscription"),
+                "[Sckt {SocketId}] adding new subscription with id {SubscriptionId}, total subscriptions on connection: {UserSubscriptionCount}");
+
+            _nothingToResubscribeCloseConnection = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(2020, "NothingToResubscribe"),
+                "[Sckt {SocketId}] nothing to resubscribe, closing connection");
+
+            _failedAuthenticationDisconnectAndRecoonect = LoggerMessage.Define<int>(
+                LogLevel.Warning,
+                new EventId(2021, "FailedAuthentication"),
+                "[Sckt {SocketId}] authentication failed on reconnected socket. Disconnecting and reconnecting");
+
+            _authenticationSucceeded = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(2022, "AuthenticationSucceeded"),
+                "[Sckt {SocketId}] authentication succeeded on reconnected socket");
+
+            _failedRequestRevitalization = LoggerMessage.Define<int, string?>(
+                LogLevel.Warning,
+                new EventId(2023, "FailedRequestRevitalization"),
+                "[Sckt {SocketId}] failed request revitalization: {ErrorMessage}");
+
+            _allSubscriptionResubscribed = LoggerMessage.Define<int>(
+                LogLevel.Debug,
+                new EventId(2024, "AllSubscriptionResubscribed"),
+                "[Sckt {SocketId}] all subscription successfully resubscribed on reconnected socket");
+
+            _subscriptionUnsubscribed = LoggerMessage.Define<int, int>(
+                LogLevel.Information,
+                new EventId(2025, "SubscriptionUnsubscribed"),
+                "[Sckt {SocketId}] subscription {SubscriptionId} unsubscribed");
+
+            _sendingPeriodic = LoggerMessage.Define<int, string>(
+                LogLevel.Trace,
+                new EventId(2026, "SendingPeriodic"),
+                "[Sckt {SocketId}] sending periodic {Identifier}");
+
+            _periodicSendFailed = LoggerMessage.Define<int, string, string>(
+                LogLevel.Warning,
+                new EventId(2027, "PeriodicSendFailed"),
+                "[Sckt {SocketId}] periodic send {Identifier} failed: {ErrorMessage}");
+
+            _sendingData = LoggerMessage.Define<int, int, string>(
+                LogLevel.Trace,
+                new EventId(2028, "SendingData"),
+                "[Sckt {SocketId}] [Req {RequestId}] sending messsage: {Data}");
+
+            _receivedMessageNotMatchedToAnyListener = LoggerMessage.Define<int, string, string>(
+                LogLevel.Warning,
+                new EventId(2029, "ReceivedMessageNotMatchedToAnyListener"),
+                "[Sckt {SocketId}] received message not matched to any listener. ListenId: {ListenId}, current listeners: {ListenIds}");
+        }
+
+        public static void ActivityPaused(this ILogger logger, int socketId, bool paused)
+        {
+            _activityPaused(logger, socketId, paused, null);
+        }
+
+        public static void SocketStatusChanged(this ILogger logger, int socketId, Sockets.SocketConnection.SocketStatus oldStatus, Sockets.SocketConnection.SocketStatus newStatus)
+        {
+            _socketStatusChanged(logger, socketId, oldStatus, newStatus, null);
+        }
+
+        public static void FailedReconnectProcessing(this ILogger logger, int socketId, string? error)
+        {
+            _failedReconnectProcessing(logger, socketId, error, null);
+        }
+
+        public static void UnkownExceptionWhileProcessingReconnection(this ILogger logger, int socketId, Exception e)
+        {
+            _unkownExceptionWhileProcessingReconnection(logger, socketId, e);
+        }
+
+        public static void WebSocketErrorCodeAndDetails(this ILogger logger, int socketId, WebSocketError error, string? details, Exception e)
+        {
+            _webSocketErrorCodeAndDetails(logger, socketId, error, details, e);
+        }
+
+        public static void WebSocketError(this ILogger logger, int socketId, string? errorMessage, Exception e)
+        {
+            _webSocketError(logger, socketId, errorMessage, e);
+        }
+
+        public static void MessageSentNotPending(this ILogger logger, int socketId, int requestId)
+        {
+            _messageSentNotPending(logger, socketId, requestId, null);
+        }
+
+        public static void ReceivedData(this ILogger logger, int socketId, string originalData)
+        {
+            _receivedData(logger, socketId, originalData, null);
+        }
+        public static void FailedToEvaluateMessage(this ILogger logger, int socketId, string originalData)
+        {
+            _failedToEvaluateMessage(logger, socketId, originalData, null);
+        }
+        public static void ErrorProcessingMessage(this ILogger logger, int socketId, Exception e)
+        {
+            _errorProcessingMessage(logger, socketId, e);
+        }
+        public static void ProcessorMatched(this ILogger logger, int socketId, int count, string listenerId)
+        {
+            _processorMatched(logger, socketId, count, listenerId, null);
+        }
+        public static void ReceivedMessageNotRecognized(this ILogger logger, int socketId, int id)
+        {
+            _receivedMessageNotRecognized(logger, socketId, id, null);
+        }
+        public static void FailedToDeserializeMessage(this ILogger logger, int socketId, string? errorMessage)
+        {
+            _failedToDeserializeMessage(logger, socketId, errorMessage, null);
+        }
+        public static void UserMessageProcessingFailed(this ILogger logger, int socketId, string errorMessage, Exception e)
+        {
+            _userMessageProcessingFailed(logger, socketId, errorMessage, e);
+        }
+        public static void MessageProcessed(this ILogger logger, int socketId, long processingTime, long parsingTime)
+        {
+            _messageProcessed(logger, socketId, processingTime, parsingTime, null);
+        }
+        public static void ClosingSubscription(this ILogger logger, int socketId, int subscriptionId)
+        {
+            _closingSubscription(logger, socketId, subscriptionId, null);
+        }
+        public static void NotUnsubscribingSubscriptionBecauseDuplicateRunning(this ILogger logger, int socketId)
+        {
+            _notUnsubscribingSubscriptionBecauseDuplicateRunning(logger, socketId, null);
+        }
+        public static void AlreadyClosing(this ILogger logger, int socketId)
+        {
+            _alreadyClosing(logger, socketId, null);
+        }
+        public static void ClosingNoMoreSubscriptions(this ILogger logger, int socketId)
+        {
+            _closingNoMoreSubscriptions(logger, socketId, null);
+        }
+        public static void AddingNewSubscription(this ILogger logger, int socketId, int subscriptionId, int userSubscriptionCount)
+        {
+            _addingNewSubscription(logger, socketId, subscriptionId, userSubscriptionCount, null);
+        }
+
+        public static void NothingToResubscribeCloseConnection(this ILogger logger, int socketId)
+        {
+            _nothingToResubscribeCloseConnection(logger, socketId, null);
+        }
+        public static void FailedAuthenticationDisconnectAndRecoonect(this ILogger logger, int socketId)
+        {
+            _failedAuthenticationDisconnectAndRecoonect(logger, socketId, null);
+        }
+        public static void AuthenticationSucceeded(this ILogger logger, int socketId)
+        {
+            _authenticationSucceeded(logger, socketId, null);
+        }
+        public static void FailedRequestRevitalization(this ILogger logger, int socketId, string? errorMessage)
+        {
+            _failedRequestRevitalization(logger, socketId, errorMessage, null);
+        }
+        public static void AllSubscriptionResubscribed(this ILogger logger, int socketId)
+        {
+            _allSubscriptionResubscribed(logger, socketId, null);
+        }
+        public static void SubscriptionUnsubscribed(this ILogger logger, int socketId, int subscriptionId)
+        {
+            _subscriptionUnsubscribed(logger, socketId, subscriptionId, null);
+        }
+        public static void SendingPeriodic(this ILogger logger, int socketId, string identifier)
+        {
+            _sendingPeriodic(logger, socketId, identifier, null);
+        }
+        public static void PeriodicSendFailed(this ILogger logger, int socketId, string identifier, string errorMessage, Exception e)
+        {
+            _periodicSendFailed(logger, socketId, identifier, errorMessage, e);
+        }
+
+        public static void SendingData(this ILogger logger, int socketId, int requestId, string data)
+        {
+            _sendingData(logger, socketId, requestId, data, null);
+        }
+
+        public static void ReceivedMessageNotMatchedToAnyListener(this ILogger logger, int socketId, string listenId, string listenIds)
+        {
+            _receivedMessageNotMatchedToAnyListener(logger, socketId, listenId, listenIds, null);
+        }
+    }
+}

CryptoExchange.Net/Logging/Extensions/SymbolOrderBookLoggingExtensions.cs

@@ -0,0 +1,236 @@
+using System;
+using CryptoExchange.Net.Objects;
+using Microsoft.Extensions.Logging;
+
+namespace CryptoExchange.Net.Logging.Extensions
+{
+    internal static class SymbolOrderBookLoggingExtensions
+    {
+        private static readonly Action<ILogger, string, string, OrderBookStatus, OrderBookStatus, Exception?> _orderBookStatusChanged;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookStarting;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookStoppedStarting;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookStopping;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookStopped;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookConnectionLost;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookDisconnected;
+        private static readonly Action<ILogger, string, string, int, Exception?> _orderBookProcessingBufferedUpdates;
+        private static readonly Action<ILogger, string, string, long, long, Exception?> _orderBookUpdateSkipped;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookOutOfSyncChecksum;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookResyncFailed;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookResyncing;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookResynced;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookMessageSkippedBecauseOfResubscribing;
+        private static readonly Action<ILogger, string, string, long, long, long, Exception?> _orderBookDataSet;
+        private static readonly Action<ILogger, string, string, long, long, long, long, Exception?> _orderBookUpdateBuffered;
+        private static readonly Action<ILogger, string, string, decimal, decimal, Exception?> _orderBookOutOfSyncDetected;
+        private static readonly Action<ILogger, string, string, Exception?> _orderBookReconnectingSocket;
+        private static readonly Action<ILogger, string, string, long, long, Exception?> _orderBookSkippedMessage;
+        private static readonly Action<ILogger, string, string, long, long, Exception?> _orderBookProcessedMessage;
+        private static readonly Action<ILogger, string, string, long, long, Exception?> _orderBookOutOfSync;
+
+        static SymbolOrderBookLoggingExtensions()
+        {
+            _orderBookStatusChanged = LoggerMessage.Define<string, string, OrderBookStatus, OrderBookStatus>(
+                LogLevel.Information,
+                new EventId(5000, "OrderBookStatusChanged"),
+                "{Api} order book {Symbol} status changed: {PreviousStatus} => {NewStatus}");
+
+            _orderBookStarting = LoggerMessage.Define<string, string>(
+                LogLevel.Debug,
+                new EventId(5001, "OrderBookStarting"),
+                "{Api} order book {Symbol} starting");
+
+            _orderBookStoppedStarting = LoggerMessage.Define<string, string>(
+                LogLevel.Debug,
+                new EventId(5002, "OrderBookStoppedStarting"),
+                "{Api} order book {Symbol} stopped while starting");
+
+            _orderBookConnectionLost = LoggerMessage.Define<string, string>(
+                LogLevel.Warning,
+                new EventId(5003, "OrderBookConnectionLost"),
+                "{Api} order book {Symbol} connection lost");
+
+            _orderBookDisconnected = LoggerMessage.Define<string, string>(
+                LogLevel.Warning,
+                new EventId(5004, "OrderBookDisconnected"),
+                "{Api} order book {Symbol} disconnected");
+
+            _orderBookStopping = LoggerMessage.Define<string, string>(
+                LogLevel.Debug,
+                new EventId(5005, "OrderBookStopping"),
+                "{Api} order book {Symbol} stopping");
+
+
+            _orderBookStopped = LoggerMessage.Define<string, string>(
+                LogLevel.Trace,
+                new EventId(5006, "OrderBookStopped"),
+                "{Api} order book {Symbol} stopped");
+
+            _orderBookProcessingBufferedUpdates = LoggerMessage.Define<string, string, int>(
+                LogLevel.Debug,
+                new EventId(5007, "OrderBookProcessingBufferedUpdates"),
+                "{Api} order book {Symbol} Processing {NumberBufferedUpdated} buffered updates");
+
+            _orderBookUpdateSkipped = LoggerMessage.Define<string, string, long, long>(
+                LogLevel.Debug,
+                new EventId(5008, "OrderBookUpdateSkipped"),
+                "{Api} order book {Symbol} update skipped #{SequenceNumber}, currently at #{LastSequenceNumber}");
+
+            _orderBookOutOfSync = LoggerMessage.Define<string, string, long, long>(
+                LogLevel.Warning,
+                new EventId(5009, "OrderBookOutOfSync"),
+                "{Api} order book {Symbol} out of sync (expected {ExpectedSequenceNumber}, was {SequenceNumber}), reconnecting");
+
+            _orderBookResynced = LoggerMessage.Define<string, string>(
+                LogLevel.Information,
+                new EventId(5010, "OrderBookResynced"),
+                "{Api} order book {Symbol} successfully resynchronized");
+
+            _orderBookMessageSkippedBecauseOfResubscribing = LoggerMessage.Define<string, string>(
+                LogLevel.Trace,
+                new EventId(5011, "OrderBookMessageSkippedResubscribing"),
+                "{Api} order book {Symbol} Skipping message because of resubscribing");
+
+            _orderBookDataSet = LoggerMessage.Define<string, string, long, long, long>(
+                LogLevel.Debug,
+                new EventId(5012, "OrderBookDataSet"),
+                "{Api} order book {Symbol} data set: {BidCount} bids, {AskCount} asks. #{EndUpdateId}");
+
+            _orderBookUpdateBuffered = LoggerMessage.Define<string, string, long, long, long, long>(
+                LogLevel.Trace,
+                new EventId(5013, "OrderBookUpdateBuffered"),
+                "{Api} order book {Symbol} update buffered #{StartUpdateId}-#{EndUpdateId} [{AsksCount} asks, {BidsCount} bids]");
+
+            _orderBookOutOfSyncDetected = LoggerMessage.Define<string, string, decimal, decimal>(
+                LogLevel.Warning,
+                new EventId(5014, "OrderBookOutOfSyncDetected"),
+                "{Api} order book {Symbol} detected out of sync order book. First ask: {FirstAsk}, first bid: {FirstBid}. Resyncing");
+
+            _orderBookReconnectingSocket = LoggerMessage.Define<string, string>(
+                LogLevel.Warning,
+                new EventId(5015, "OrderBookReconnectingSocket"),
+                "{Api} order book {Symbol} out of sync. Reconnecting socket");
+
+            _orderBookResyncing = LoggerMessage.Define<string, string>(
+                LogLevel.Warning,
+                new EventId(5016, "OrderBookResyncing"),
+                "{Api} order book {Symbol} out of sync. Resyncing");
+
+            _orderBookResyncFailed = LoggerMessage.Define<string, string>(
+                LogLevel.Warning,
+                new EventId(5017, "OrderBookResyncFailed"),
+                "{Api} order book {Symbol} resync failed, reconnecting socket");
+
+            _orderBookSkippedMessage = LoggerMessage.Define<string, string, long, long>(
+                LogLevel.Trace,
+                new EventId(5018, "OrderBookSkippedMessage"),
+                "{Api} order book {Symbol} update skipped #{FirstUpdateId}-{LastUpdateId}");
+
+            _orderBookProcessedMessage = LoggerMessage.Define<string, string, long, long>(
+                LogLevel.Trace,
+                new EventId(5019, "OrderBookProcessedMessage"),
+                "{Api} order book {Symbol} update processed #{FirstUpdateId}-{LastUpdateId}");
+
+            _orderBookOutOfSyncChecksum = LoggerMessage.Define<string, string>(
+                LogLevel.Warning,
+                new EventId(5020, "OrderBookOutOfSyncChecksum"),
+                "{Api} order book {Symbol} out of sync. Checksum mismatch, resyncing");
+        }
+
+        public static void OrderBookStatusChanged(this ILogger logger, string api, string symbol, OrderBookStatus previousStatus, OrderBookStatus newStatus)
+        {
+            _orderBookStatusChanged(logger, api, symbol, previousStatus, newStatus, null);
+        }
+        public static void OrderBookStarting(this ILogger logger, string api, string symbol)
+        {
+            _orderBookStarting(logger, api, symbol, null);
+        }
+        public static void OrderBookStoppedStarting(this ILogger logger, string api, string symbol)
+        {
+            _orderBookStoppedStarting(logger, api, symbol, null);
+        }
+        public static void OrderBookConnectionLost(this ILogger logger, string api, string symbol)
+        {
+            _orderBookConnectionLost(logger, api, symbol, null);
+        }
+
+        public static void OrderBookDisconnected(this ILogger logger, string api, string symbol)
+        {
+            _orderBookDisconnected(logger, api, symbol, null);
+        }
+
+        public static void OrderBookStopping(this ILogger logger, string api, string symbol)
+        {
+            _orderBookStopping(logger, api, symbol, null);
+        }
+
+        public static void OrderBookStopped(this ILogger logger, string api, string symbol)
+        {
+            _orderBookStopped(logger, api, symbol, null);
+        }
+
+        public static void OrderBookProcessingBufferedUpdates(this ILogger logger, string api, string symbol, int numberBufferedUpdated)
+        {
+            _orderBookProcessingBufferedUpdates(logger, api, symbol, numberBufferedUpdated, null);
+        }
+
+        public static void OrderBookUpdateSkipped(this ILogger logger, string api, string symbol, long sequence, long lastSequenceNumber)
+        {
+            _orderBookUpdateSkipped(logger, api, symbol, sequence, lastSequenceNumber, null);
+        }
+
+        public static void OrderBookOutOfSync(this ILogger logger, string api, string symbol, long expectedSequenceNumber, long sequenceNumber)
+        {
+            _orderBookOutOfSync(logger, api, symbol, expectedSequenceNumber, sequenceNumber, null);
+        }
+
+        public static void OrderBookResynced(this ILogger logger, string api, string symbol)
+        {
+            _orderBookResynced(logger, api, symbol, null);
+        }
+
+        public static void OrderBookMessageSkippedResubscribing(this ILogger logger, string api, string symbol)
+        {
+            _orderBookMessageSkippedBecauseOfResubscribing(logger, api, symbol, null);
+        }
+        public static void OrderBookDataSet(this ILogger logger, string api, string symbol, long bidCount, long askCount, long endUpdateId)
+        {
+            _orderBookDataSet(logger, api, symbol, bidCount, askCount, endUpdateId, null);
+        }
+        public static void OrderBookUpdateBuffered(this ILogger logger, string api, string symbol, long startUpdateId, long endUpdateId, long asksCount, long bidsCount)
+        {
+            _orderBookUpdateBuffered(logger, api, symbol, startUpdateId, endUpdateId, asksCount, bidsCount, null);
+        }
+        public static void OrderBookOutOfSyncDetected(this ILogger logger, string api, string symbol, decimal firstAsk, decimal firstBid)
+        {
+            _orderBookOutOfSyncDetected(logger, api, symbol, firstAsk, firstBid, null);
+        }
+
+        public static void OrderBookReconnectingSocket(this ILogger logger, string api, string symbol)
+        {
+            _orderBookReconnectingSocket(logger, api, symbol, null);
+        }
+
+        public static void OrderBookResyncing(this ILogger logger, string api, string symbol)
+        {
+            _orderBookResyncing(logger, api, symbol, null);
+        }
+        public static void OrderBookResyncFailed(this ILogger logger, string api, string symbol)
+        {
+            _orderBookResyncFailed(logger, api, symbol, null);
+        }
+        public static void OrderBookSkippedMessage(this ILogger logger, string api, string symbol, long firstUpdateId, long lastUpdateId)
+        {
+            _orderBookSkippedMessage(logger, api, symbol, firstUpdateId, lastUpdateId, null);
+        }
+        public static void OrderBookProcessedMessage(this ILogger logger, string api, string symbol, long firstUpdateId, long lastUpdateId)
+        {
+            _orderBookProcessedMessage(logger, api, symbol, firstUpdateId, lastUpdateId, null);
+        }
+
+        public static void OrderBookOutOfSyncChecksum(this ILogger logger, string api, string symbol)
+        {
+            _orderBookOutOfSyncChecksum(logger, api, symbol, null);
+        }
+    }
+}

CryptoExchange.Net/Objects/CallResult.cs

@@ -70,7 +70,7 @@ namespace CryptoExchange.Net.Objects
         /// <param name="originalData"></param>
         /// <param name="error"></param>
 #pragma warning disable 8618
-        protected CallResult([AllowNull]T data, string? originalData, Error? error): base(error)
+        public CallResult([AllowNull]T data, string? originalData, Error? error): base(error)
 #pragma warning restore 8618
         {
             OriginalData = originalData;
@@ -91,6 +91,13 @@ namespace CryptoExchange.Net.Objects
         /// <param name="error">The erro rto return</param>
         public CallResult(Error error) : this(default, null, error) { }
 
+        /// <summary>
+        /// Create a new error result
+        /// </summary>
+        /// <param name="error">The error to return</param>
+        /// <param name="originalData">The original response data</param>
+        public CallResult(Error error, string? originalData) : this(default, originalData, error) { }
+
         /// <summary>
         /// Overwrite bool check so we can use if(callResult) instead of if(callResult.Success)
         /// </summary>
@@ -186,6 +193,11 @@ namespace CryptoExchange.Net.Objects
         /// </summary>
         public IEnumerable<KeyValuePair<string, IEnumerable<string>>>? RequestHeaders { get; set; }
 
+        /// <summary>
+        /// The request id
+        /// </summary>
+        public int? RequestId { get; set; }
+
         /// <summary>
         /// The url which was requested
         /// </summary>
@@ -217,6 +229,7 @@ namespace CryptoExchange.Net.Objects
         /// <param name="code"></param>
         /// <param name="responseHeaders"></param>
         /// <param name="responseTime"></param>
+        /// <param name="requestId"></param>
         /// <param name="requestUrl"></param>
         /// <param name="requestBody"></param>
         /// <param name="requestMethod"></param>
@@ -226,6 +239,7 @@ namespace CryptoExchange.Net.Objects
             HttpStatusCode? code,
             IEnumerable<KeyValuePair<string, IEnumerable<string>>>? responseHeaders,
             TimeSpan? responseTime,
+            int? requestId,
             string? requestUrl,
             string? requestBody,
             HttpMethod? requestMethod,
@@ -235,6 +249,7 @@ namespace CryptoExchange.Net.Objects
             ResponseStatusCode = code;
             ResponseHeaders = responseHeaders;
             ResponseTime = responseTime;
+            RequestId = requestId;
 
             RequestUrl = requestUrl;
             RequestBody = requestBody;
@@ -255,7 +270,7 @@ namespace CryptoExchange.Net.Objects
         /// <returns></returns>
         public WebCallResult AsError(Error error)
         {
-            return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, RequestUrl, RequestBody, RequestMethod, RequestHeaders, error);
+            return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, error);
         }
 
         /// <inheritdoc />
@@ -281,6 +296,11 @@ namespace CryptoExchange.Net.Objects
         /// </summary>
         public IEnumerable<KeyValuePair<string, IEnumerable<string>>>? RequestHeaders { get; set; }
 
+        /// <summary>
+        /// The request id
+        /// </summary>
+        public int? RequestId { get; set; }
+
         /// <summary>
         /// The url which was requested
         /// </summary>
@@ -319,6 +339,7 @@ namespace CryptoExchange.Net.Objects
         /// <param name="responseTime"></param>
         /// <param name="responseLength"></param>
         /// <param name="originalData"></param>
+        /// <param name="requestId"></param>
         /// <param name="requestUrl"></param>
         /// <param name="requestBody"></param>
         /// <param name="requestMethod"></param>
@@ -331,6 +352,7 @@ namespace CryptoExchange.Net.Objects
             TimeSpan? responseTime,
             long? responseLength,
             string? originalData,
+            int? requestId,
             string? requestUrl,
             string? requestBody,
             HttpMethod? requestMethod,
@@ -343,6 +365,7 @@ namespace CryptoExchange.Net.Objects
             ResponseTime = responseTime;
             ResponseLength = responseLength;
 
+            RequestId = requestId;
             RequestUrl = requestUrl;
             RequestBody = requestBody;
             RequestHeaders = requestHeaders;
@@ -355,7 +378,7 @@ namespace CryptoExchange.Net.Objects
         /// <returns></returns>
         public new WebCallResult AsDataless()
         {
-            return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, RequestUrl, RequestBody, RequestMethod, RequestHeaders, Error);
+            return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, Error);
         }
         /// <summary>
         /// Copy as a dataless result
@@ -363,14 +386,14 @@ namespace CryptoExchange.Net.Objects
         /// <returns></returns>
         public new WebCallResult AsDatalessError(Error error)
         {
-            return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, RequestUrl, RequestBody, RequestMethod, RequestHeaders, error);
+            return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, RequestId, 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, null, default, error) { }
+        public WebCallResult(Error? error) : this(null, null, null, null, null, null, null, null, null, null, default, error) { }
 
         /// <summary>
         /// Copy the WebCallResult to a new data type
@@ -380,7 +403,7 @@ namespace CryptoExchange.Net.Objects
         /// <returns></returns>
         public new WebCallResult<K> As<K>([AllowNull] K data)
         {
-            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestUrl, RequestBody, RequestMethod, RequestHeaders, data, Error);
+            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, data, Error);
         }
 
         /// <summary>
@@ -391,7 +414,7 @@ namespace CryptoExchange.Net.Objects
         /// <returns></returns>
         public new WebCallResult<K> AsError<K>(Error error)
         {
-            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestUrl, RequestBody, RequestMethod, RequestHeaders, default, error);
+            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, default, error);
         }
 
         /// <inheritdoc />

CryptoExchange.Net/Objects/Enums.cs

@@ -15,6 +15,29 @@
         Wait
     }
 
+    /// <summary>
+    /// What to do when a request would exceed the rate limit
+    /// </summary>
+    public enum RateLimitWindowType
+    {
+        /// <summary>
+        /// A sliding window
+        /// </summary>
+        Sliding,
+        /// <summary>
+        /// A fixed interval window
+        /// </summary>
+        Fixed,
+        /// <summary>
+        /// A fixed interval starting after the first request
+        /// </summary>
+        FixedAfterFirst,
+        /// <summary>
+        /// Decaying window
+        /// </summary>
+        Decay
+    }
+
     /// <summary>
     /// Where the parameters for a HttpMethod should be added in a request
     /// </summary>
@@ -99,15 +122,22 @@
     /// Define how array parameters should be send
     /// </summary>
     public enum ArrayParametersSerialization
+#pragma warning disable CS1570 // XML comment has badly formed XML
     {
         /// <summary>
-        /// Send multiple key=value for each entry
+        /// Send as key=value1&key=value2
         /// </summary>
         MultipleValues,
+
         /// <summary>
-        /// Create an []=value array
+        /// Send as key[]=value1&key[]=value2
         /// </summary>
-        Array
+        Array,
+        /// <summary>
+        /// Send as key=[value1, value2]
+        /// </summary>
+        JsonArray
+#pragma warning restore CS1570 // XML comment has badly formed XML
     }
 
     /// <summary>

CryptoExchange.Net/Objects/Error.cs

@@ -41,7 +41,7 @@ namespace CryptoExchange.Net.Objects
         /// <returns></returns>
         public override string ToString()
         {
-            return Code != null ? $"{Code}: {Message} {Data}" : $"{Message} {Data}";
+            return Code != null ? $"[{GetType().Name}] {Code}: {Message} {Data}" : $"[{GetType().Name}] {Message} {Data}";
         }
     }
 
@@ -278,7 +278,7 @@ namespace CryptoExchange.Net.Objects
         /// <param name="code"></param>
         /// <param name="message"></param>
         /// <param name="data"></param>
-        protected CancellationRequestedError(int? code, string message, object? data): base(code, message, data) { }
+        public CancellationRequestedError(int? code, string message, object? data): base(code, message, data) { }
     }
 
     /// <summary>

CryptoExchange.Net/Objects/Options/ExchangeOptions.cs

@@ -28,6 +28,15 @@ namespace CryptoExchange.Net.Objects.Options
         /// </summary>        
         public ApiCredentials? ApiCredentials { get; set; }
 
+        /// <summary>
+        /// Whether or not client side rate limiting should be applied
+        /// </summary>
+        public bool RateLimiterEnabled { get; set; } = true;
+        /// <summary>
+        /// What should happen when a rate limit is reached
+        /// </summary>
+        public RateLimitingBehaviour RateLimitingBehaviour { get; set; } = RateLimitingBehaviour.Wait;
+
         /// <inheritdoc />
         public override string ToString()
         {

CryptoExchange.Net/Objects/Options/OrderBookOptions.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// Base for order book options
     /// </summary>
-    public class OrderBookOptions : ExchangeOptions
+    public class OrderBookOptions
     {
         /// <summary>
         /// Whether or not checksum validation is enabled. Default is true, disabling will ignore checksum messages.
@@ -19,11 +19,7 @@
         {
             return new T
             {
-                ApiCredentials = ApiCredentials?.Copy(),
-                OutputOriginalData = OutputOriginalData,
                 ChecksumValidationEnabled = ChecksumValidationEnabled,
-                Proxy = Proxy,
-                RequestTimeout = RequestTimeout
             };
         }
     }

CryptoExchange.Net/Objects/Options/RestApiOptions.cs

@@ -1,7 +1,5 @@
 using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Interfaces;
 using System;
-using System.Collections.Generic;
 
 namespace CryptoExchange.Net.Objects.Options
 {
@@ -10,16 +8,6 @@ namespace CryptoExchange.Net.Objects.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>
@@ -42,8 +30,6 @@ namespace CryptoExchange.Net.Objects.Options
                 ApiCredentials = ApiCredentials?.Copy(),
                 OutputOriginalData = OutputOriginalData,
                 AutoTimestamp = AutoTimestamp,
-                RateLimiters = RateLimiters,
-                RateLimitingBehaviour = RateLimitingBehaviour,
                 TimestampRecalculationInterval = TimestampRecalculationInterval
             };
         }

CryptoExchange.Net/Objects/Options/RestExchangeOptions.cs

@@ -32,7 +32,9 @@ namespace CryptoExchange.Net.Objects.Options
                 TimestampRecalculationInterval = TimestampRecalculationInterval,
                 ApiCredentials = ApiCredentials?.Copy(),
                 Proxy = Proxy,
-                RequestTimeout = RequestTimeout
+                RequestTimeout = RequestTimeout,
+                RateLimiterEnabled = RateLimiterEnabled,
+                RateLimitingBehaviour = RateLimitingBehaviour
             };
         }
     }

CryptoExchange.Net/Objects/Options/SocketApiOptions.cs

@@ -1,7 +1,5 @@
 using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Interfaces;
 using System;
-using System.Collections.Generic;
 
 namespace CryptoExchange.Net.Objects.Options
 {
@@ -10,11 +8,6 @@ namespace CryptoExchange.Net.Objects.Options
     /// </summary>
     public class SocketApiOptions : ApiOptions
     {
-        /// <summary>
-        /// List of rate limiters to use
-        /// </summary>
-        public List<IRateLimiter> RateLimiters { get; set; } = new List<IRateLimiter>();
-
         /// <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
@@ -37,7 +30,6 @@ namespace CryptoExchange.Net.Objects.Options
             {
                 ApiCredentials = ApiCredentials?.Copy(),
                 OutputOriginalData = OutputOriginalData,
-                RateLimiters = RateLimiters,
                 SocketNoDataTimeout = SocketNoDataTimeout,
                 MaxSocketConnections = MaxSocketConnections,
             };

CryptoExchange.Net/Objects/Options/SocketExchangeOptions.cs

@@ -65,7 +65,9 @@ namespace CryptoExchange.Net.Objects.Options
                 SocketSubscriptionsCombineTarget = SocketSubscriptionsCombineTarget,
                 MaxSocketConnections = MaxSocketConnections,
                 Proxy = Proxy,
-                RequestTimeout = RequestTimeout
+                RequestTimeout = RequestTimeout,
+                RateLimitingBehaviour = RateLimitingBehaviour,
+                RateLimiterEnabled = RateLimiterEnabled,
             };
         }
     }

CryptoExchange.Net/Objects/ParameterCollection.cs

@@ -1,5 +1,5 @@
 using CryptoExchange.Net.Attributes;
-using CryptoExchange.Net.Converters;
+using CryptoExchange.Net.Converters.SystemTextJson;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -158,6 +158,17 @@ namespace CryptoExchange.Net.Objects
             Add(key, EnumConverter.GetString(value)!);
         }
 
+        /// <summary>
+        /// Add an enum value as the string value as mapped using the <see cref="MapAttribute" />
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        public void AddEnumAsInt<T>(string key, T value)
+        {
+            var stringVal = EnumConverter.GetString(value);
+            Add(key, EnumConverter.GetString(int.Parse(stringVal))!);
+        }
+
         /// <summary>
         /// Add an enum value as the string value as mapped using the <see cref="MapAttribute" />. Not added if value is null
         /// </summary>
@@ -168,5 +179,19 @@ namespace CryptoExchange.Net.Objects
             if (value != null)
                 Add(key, EnumConverter.GetString(value));
         }
+
+        /// <summary>
+        /// Add an enum value as the string value as mapped using the <see cref="MapAttribute" />. Not added if value is null
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        public void AddOptionalEnumAsInt<T>(string key, T? value)
+        {
+            if (value != null)
+            {
+                var stringVal = EnumConverter.GetString(value);
+                Add(key, int.Parse(stringVal));
+            }
+        }
     }
 }

CryptoExchange.Net/Objects/RateLimiter.cs

@@ -1,443 +0,0 @@
-using CryptoExchange.Net.Interfaces;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net.Http;
-using System.Security;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CryptoExchange.Net.Objects
-{
-    /// <summary>
-    /// Limits the amount of requests to a certain constraint
-    /// </summary>
-    public class RateLimiter : IRateLimiter
-    {
-        private readonly object _limiterLock = new object();
-        internal List<Limiter> _limiters = new List<Limiter>();
-
-        /// <summary>
-        /// Create a new RateLimiter. Configure the rate limiter by calling <see cref="AddTotalRateLimit"/>, 
-        /// <see cref="AddEndpointLimit(string, int, TimeSpan, HttpMethod?, bool)"/>, <see cref="AddPartialEndpointLimit(string, int, TimeSpan, HttpMethod?, bool, bool)"/> or <see cref="AddApiKeyLimit"/>.
-        /// </summary>
-        public RateLimiter()
-        {
-        }
-
-        /// <summary>
-        /// Add a rate limit for the total amount of requests per time period
-        /// </summary>
-        /// <param name="limit">The limit per period. Note that this is weight, not single request, altough by default requests have a weight of 1</param>
-        /// <param name="perTimePeriod">The time period the limit is for</param>
-        public RateLimiter AddTotalRateLimit(int limit, TimeSpan perTimePeriod)
-        {
-            lock(_limiterLock)
-                _limiters.Add(new TotalRateLimiter(limit, perTimePeriod, null));
-            return this;
-        }
-
-        /// <summary>
-        /// Add a rate lmit for the amount of requests per time for an endpoint
-        /// </summary>
-        /// <param name="endpoint">The endpoint the limit is for</param>
-        /// <param name="limit">The limit per period. Note that this is weight, not single request, altough by default requests have a weight of 1</param>
-        /// <param name="perTimePeriod">The time period the limit is for</param>
-        /// <param name="method">The HttpMethod the limit is for, null for all</param>
-        /// <param name="excludeFromOtherRateLimits">If set to true it ignores other rate limits</param>
-        public RateLimiter AddEndpointLimit(string endpoint, int limit, TimeSpan perTimePeriod, HttpMethod? method = null, bool excludeFromOtherRateLimits = false)
-        {
-            lock(_limiterLock)
-                _limiters.Add(new EndpointRateLimiter(new[] { endpoint }, limit, perTimePeriod, method, excludeFromOtherRateLimits));
-            return this;
-        }
-
-        /// <summary>
-        /// Add a rate lmit for the amount of requests per time for an endpoint
-        /// </summary>
-        /// <param name="endpoints">The endpoints the limit is for</param>
-        /// <param name="limit">The limit per period. Note that this is weight, not single request, altough by default requests have a weight of 1</param>
-        /// <param name="perTimePeriod">The time period the limit is for</param>
-        /// <param name="method">The HttpMethod the limit is for, null for all</param>
-        /// <param name="excludeFromOtherRateLimits">If set to true it ignores other rate limits</param>
-        public RateLimiter AddEndpointLimit(IEnumerable<string> endpoints, int limit, TimeSpan perTimePeriod, HttpMethod? method = null, bool excludeFromOtherRateLimits = false)
-        {
-            lock(_limiterLock)
-                _limiters.Add(new EndpointRateLimiter(endpoints.ToArray(), limit, perTimePeriod, method, excludeFromOtherRateLimits));
-            return this;
-        }
-
-        /// <summary>
-        /// Add a rate lmit for the amount of requests per time for an endpoint
-        /// </summary>
-        /// <param name="endpoint">The endpoint the limit is for</param>
-        /// <param name="limit">The limit per period. Note that this is weight, not single request, altough by default requests have a weight of 1</param>
-        /// <param name="perTimePeriod">The time period the limit is for</param>
-        /// <param name="method">The HttpMethod the limit is for, null for all</param>
-        /// <param name="ignoreOtherRateLimits">If set to true it ignores other rate limits</param>
-        /// <param name="countPerEndpoint">Whether all requests for this partial endpoint are bound to the same limit or each individual endpoint has its own limit</param>
-        public RateLimiter AddPartialEndpointLimit(string endpoint, int limit, TimeSpan perTimePeriod, HttpMethod? method = null, bool countPerEndpoint = false, bool ignoreOtherRateLimits = false)
-        {
-            lock(_limiterLock)
-                _limiters.Add(new PartialEndpointRateLimiter(new[] { endpoint }, limit, perTimePeriod, method, ignoreOtherRateLimits, countPerEndpoint));
-            return this;
-        }
-
-        /// <summary>
-        /// Add a rate limit for the amount of requests per Api key
-        /// </summary>
-        /// <param name="limit">The limit per period. Note that this is weight, not single request, altough by default requests have a weight of 1</param>
-        /// <param name="perTimePeriod">The time period the limit is for</param>
-        /// <param name="onlyForSignedRequests">Only include calls that are signed in this limiter</param>
-        /// <param name="excludeFromTotalRateLimit">Exclude requests with API key from the total rate limiter</param>
-        public RateLimiter AddApiKeyLimit(int limit, TimeSpan perTimePeriod, bool onlyForSignedRequests, bool excludeFromTotalRateLimit)
-        {
-            lock(_limiterLock)
-                _limiters.Add(new ApiKeyRateLimiter(limit, perTimePeriod, null, onlyForSignedRequests, excludeFromTotalRateLimit));
-            return this;
-        }
-
-        /// <summary>
-        /// Add a rate limit for the amount of messages that can be send per connection
-        /// </summary>
-        /// <param name="endpoint">The endpoint that the limit is for</param>
-        /// <param name="limit">The limit per period. Note that this is weight, not single request, altough by default requests have a weight of 1</param>
-        /// <param name="perTimePeriod">The time period the limit is for</param>
-        public RateLimiter AddConnectionRateLimit(string endpoint, int limit, TimeSpan perTimePeriod)
-        {
-            lock (_limiterLock)
-                _limiters.Add(new ConnectionRateLimiter(new[] { endpoint }, limit, perTimePeriod));
-            return this;
-        }
-
-        /// <inheritdoc />
-        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;
-
-            List<EndpointRateLimiter> endpointLimits;
-            lock (_limiterLock)
-                endpointLimits = _limiters.OfType<EndpointRateLimiter>().Where(h => h.Endpoints.Contains(endpoint) && (h.Method  == null || h.Method == method)).ToList();
-            foreach (var endpointLimit in endpointLimits)
-            {
-                var waitResult = await ProcessTopic(logger, endpointLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
-                if (!waitResult)
-                    return waitResult;
-
-                totalWaitTime += waitResult.Data;
-            }
-
-            if (endpointLimits.Any(l => l.IgnoreOtherRateLimits))
-                return new CallResult<int>(totalWaitTime);
-
-            List<PartialEndpointRateLimiter> partialEndpointLimits;
-            lock (_limiterLock)
-                partialEndpointLimits = _limiters.OfType<PartialEndpointRateLimiter>().Where(h => h.PartialEndpoints.Any(h => endpoint.Contains(h)) && (h.Method == null || h.Method == method)).ToList();
-            foreach (var partialEndpointLimit in partialEndpointLimits)
-            {
-                if (partialEndpointLimit.CountPerEndpoint)
-                {
-                    SingleTopicRateLimiter? thisEndpointLimit;
-                    lock (_limiterLock)
-                    {
-                        thisEndpointLimit = _limiters.OfType<SingleTopicRateLimiter>().SingleOrDefault(h => h.Type == RateLimitType.PartialEndpoint && (string)h.Topic == endpoint);
-                        if (thisEndpointLimit == null)
-                        {
-                            thisEndpointLimit = new SingleTopicRateLimiter(endpoint, partialEndpointLimit);
-                            _limiters.Add(thisEndpointLimit);
-                        }
-                    }
-
-                    var waitResult = await ProcessTopic(logger, thisEndpointLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
-                    if (!waitResult)
-                        return waitResult;
-
-                    totalWaitTime += waitResult.Data;
-                }
-                else
-                {
-                    var waitResult = await ProcessTopic(logger, partialEndpointLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
-                    if (!waitResult)
-                        return waitResult;
-
-                    totalWaitTime += waitResult.Data;
-                }
-            }
-
-            if(partialEndpointLimits.Any(p => p.IgnoreOtherRateLimits))
-                return new CallResult<int>(totalWaitTime);
-
-            List<ApiKeyRateLimiter> apiLimits;
-            lock (_limiterLock)
-                apiLimits = _limiters.OfType<ApiKeyRateLimiter>().Where(h => h.Type == RateLimitType.ApiKey).ToList();
-            foreach (var apiLimit in apiLimits)
-            {
-                if(apiKey == null)
-                {
-                    if (!apiLimit.OnlyForSignedRequests)
-                    {
-                        var waitResult = await ProcessTopic(logger, apiLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
-                        if (!waitResult)
-                            return waitResult;
-
-                        totalWaitTime += waitResult.Data;
-                    }
-                }
-                else if (signed || !apiLimit.OnlyForSignedRequests)
-                {
-                    SingleTopicRateLimiter? thisApiLimit;
-                    lock (_limiterLock)
-                    {
-                        thisApiLimit = _limiters.OfType<SingleTopicRateLimiter>().SingleOrDefault(h => h.Type == RateLimitType.ApiKey && ((SecureString)h.Topic).IsEqualTo(apiKey));
-                        if (thisApiLimit == null)
-                        {
-                            thisApiLimit = new SingleTopicRateLimiter(apiKey, apiLimit);
-                            _limiters.Add(thisApiLimit);
-                        }
-                    }
-
-                    var waitResult = await ProcessTopic(logger, thisApiLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
-                    if (!waitResult)
-                        return waitResult;
-
-                    totalWaitTime += waitResult.Data;
-                }
-            }
-
-            if ((signed || apiLimits.All(l => !l.OnlyForSignedRequests)) && apiLimits.Any(l => l.IgnoreTotalRateLimit))
-                return new CallResult<int>(totalWaitTime);
-
-            List<TotalRateLimiter> totalLimits;
-            lock (_limiterLock)
-                totalLimits = _limiters.OfType<TotalRateLimiter>().ToList();
-            foreach(var totalLimit in  totalLimits) 
-            {
-                var waitResult = await ProcessTopic(logger, totalLimit, endpoint, requestWeight, limitBehaviour, ct).ConfigureAwait(false);
-                if (!waitResult)
-                    return waitResult;
-
-                totalWaitTime += waitResult.Data;
-            }
-
-            return new CallResult<int>(totalWaitTime);
-        }
-
-        private static async Task<CallResult<int>> ProcessTopic(ILogger logger, Limiter historyTopic, string endpoint, int requestWeight, RateLimitingBehaviour limitBehaviour, CancellationToken ct)
-        {
-            var sw = Stopwatch.StartNew();
-            try
-            {
-                await historyTopic.Semaphore.WaitAsync(ct).ConfigureAwait(false);
-            }
-            catch (OperationCanceledException)
-            {
-                return new CallResult<int>(new CancellationRequestedError());
-            }
-            sw.Stop();
-
-            try
-            {
-                int totalWaitTime = 0;
-                while (true)
-                {
-                    // Remove requests no longer in time period from the history
-                    var checkTime = DateTime.UtcNow;
-                    for (var i = 0; i < historyTopic.Entries.Count; i++)
-                    {
-                        if (historyTopic.Entries[i].Timestamp < checkTime - historyTopic.Period)
-                        {
-                            historyTopic.Entries.Remove(historyTopic.Entries[i]);
-                            i--;
-                        }
-                        else
-                            break;
-                    }
-
-                    var currentWeight = !historyTopic.Entries.Any() ? 0 : historyTopic.Entries.Sum(h => h.Weight);
-                    if (currentWeight + requestWeight > historyTopic.Limit)
-                    {
-                        if (currentWeight == 0)
-                            throw new Exception("Request limit reached without any prior request. " +
-                                $"This request can never execute with the current rate limiter. Request weight: {requestWeight}, Ratelimit: {historyTopic.Limit}");
-
-                        // Wait until the next entry should be removed from the history
-                        var thisWaitTime = (int)Math.Round(((historyTopic.Entries.First().Timestamp + historyTopic.Period) - checkTime).TotalMilliseconds);
-                        if (thisWaitTime > 0)
-                        {
-                            if (limitBehaviour == RateLimitingBehaviour.Fail)
-                            {
-                                var msg = $"Request to {endpoint} failed because of rate limit `{historyTopic.Type}`. Current weight: {currentWeight}/{historyTopic.Limit}, request weight: {requestWeight}";
-                                logger.Log(LogLevel.Warning, msg);
-                                return new CallResult<int>(new ClientRateLimitError(msg) { RetryAfter = DateTime.UtcNow.AddSeconds(thisWaitTime) });
-                            }
-
-                            logger.Log(LogLevel.Information, $"Message 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);
-                            }
-                            catch (OperationCanceledException)
-                            {
-                                return new CallResult<int>(new CancellationRequestedError());
-                            }
-                            totalWaitTime += thisWaitTime;
-                        }
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-
-                var newTime = DateTime.UtcNow;
-                historyTopic.Entries.Add(new LimitEntry(newTime, requestWeight));
-                return new CallResult<int>(totalWaitTime);
-            }
-            finally
-            {
-                historyTopic.Semaphore.Release();
-            }
-        }
-
-        internal struct LimitEntry
-        {
-            public DateTime Timestamp { get; set; }
-            public int Weight { get; set; }
-
-            public LimitEntry(DateTime timestamp, int weight)
-            {
-                Timestamp = timestamp;
-                Weight = weight;
-            }
-        }
-
-        internal class Limiter
-        {
-            public RateLimitType Type { get; set; }
-            public HttpMethod? Method { get; set; }
-
-            public SemaphoreSlim Semaphore { get; set; }
-            public int Limit { get; set; }
-
-            public TimeSpan Period { get; set; }
-            public List<LimitEntry> Entries { get; set; } = new List<LimitEntry>();
-
-            public Limiter(RateLimitType type, int limit, TimeSpan perPeriod, HttpMethod? method)
-            {
-                Semaphore = new SemaphoreSlim(1, 1);
-                Type = type;
-                Limit = limit;
-                Period = perPeriod;
-                Method = method;
-            }
-        }
-
-        internal class TotalRateLimiter : Limiter
-        {
-            public TotalRateLimiter(int limit, TimeSpan perPeriod, HttpMethod? method)
-                : base(RateLimitType.Total, limit, perPeriod, method)
-            {
-            }
-
-            public override string ToString()
-            {
-                return nameof(TotalRateLimiter);
-            }
-        }
-
-        internal class ConnectionRateLimiter : PartialEndpointRateLimiter
-        {
-            public ConnectionRateLimiter(int limit, TimeSpan perPeriod)
-                : base(new[] { "/" }, limit, perPeriod, null, true, true)
-            {
-            }
-
-            public ConnectionRateLimiter(string[] endpoints, int limit, TimeSpan perPeriod)
-                : base(endpoints, limit, perPeriod, null, true, true)
-            {
-            }
-
-            public override string ToString()
-            {
-                return nameof(ConnectionRateLimiter);
-            }
-        }
-
-        internal class EndpointRateLimiter: Limiter
-        {
-            public string[] Endpoints { get; set; }
-            public bool IgnoreOtherRateLimits { get; set; }
-
-            public EndpointRateLimiter(string[] endpoints, int limit, TimeSpan perPeriod, HttpMethod? method, bool ignoreOtherRateLimits)
-                :base(RateLimitType.Endpoint, limit, perPeriod, method)
-            {
-                Endpoints = endpoints;
-                IgnoreOtherRateLimits = ignoreOtherRateLimits;
-            }
-
-            public override string ToString()
-            {
-                return nameof(EndpointRateLimiter) + $": {string.Join(", ", Endpoints)}";
-            }
-        }
-
-        internal class PartialEndpointRateLimiter : Limiter
-        {
-            public string[] PartialEndpoints { get; set; }
-            public bool IgnoreOtherRateLimits { get; set; }
-            public bool CountPerEndpoint { get; set; }
-
-            public PartialEndpointRateLimiter(string[] partialEndpoints, int limit, TimeSpan perPeriod, HttpMethod? method, bool ignoreOtherRateLimits, bool countPerEndpoint)
-                : base(RateLimitType.PartialEndpoint, limit, perPeriod, method)
-            {
-                PartialEndpoints = partialEndpoints;
-                IgnoreOtherRateLimits = ignoreOtherRateLimits;
-                CountPerEndpoint = countPerEndpoint;
-            }
-
-            public override string ToString()
-            {
-                return nameof(PartialEndpointRateLimiter) + $": {string.Join(", ", PartialEndpoints)}";
-            }
-        }
-
-        internal class ApiKeyRateLimiter : Limiter
-        {
-            public bool OnlyForSignedRequests { get; set; }
-            public bool IgnoreTotalRateLimit { get; set; }
-
-            public ApiKeyRateLimiter(int limit, TimeSpan perPeriod, HttpMethod? method, bool onlyForSignedRequests, bool ignoreTotalRateLimit)
-                :base(RateLimitType.ApiKey, limit, perPeriod, method)
-            {
-                OnlyForSignedRequests = onlyForSignedRequests;
-                IgnoreTotalRateLimit = ignoreTotalRateLimit;
-            }
-        }
-
-        internal class SingleTopicRateLimiter: Limiter
-        {
-            public object Topic { get; set; }
-
-            public SingleTopicRateLimiter(object topic, Limiter limiter)
-                :base(limiter.Type, limiter.Limit, limiter.Period, limiter.Method)
-            {
-                Topic = topic;
-            }
-
-            public override string ToString()
-            {
-                return (Type == RateLimitType.ApiKey ? nameof(ApiKeyRateLimiter): nameof(EndpointRateLimiter)) + $": {Topic}";
-            }
-        }
-
-        internal enum RateLimitType 
-        { 
-            Total,
-            Endpoint,
-            PartialEndpoint,
-            ApiKey
-        }
-    }
-}

CryptoExchange.Net/Objects/RequestDefinition.cs

@@ -0,0 +1,81 @@
+using CryptoExchange.Net.RateLimiting.Interfaces;
+using System;
+using System.Net.Http;
+
+namespace CryptoExchange.Net.Objects
+{
+    /// <summary>
+    /// The definition of a rest request
+    /// </summary>
+    public class RequestDefinition
+    {
+        private string? _stringRep;
+
+        // Basics
+
+        /// <summary>
+        /// Path of the request
+        /// </summary>
+        public string Path { get; set; }
+        /// <summary>
+        /// Http method of the request
+        /// </summary>
+        public HttpMethod Method { get; set; }
+        /// <summary>
+        /// Is the request authenticated
+        /// </summary>
+        public bool Authenticated { get; set; }
+
+
+        // Formating
+
+        /// <summary>
+        /// The body format for this request
+        /// </summary>
+        public RequestBodyFormat? RequestBodyFormat { get; set; }
+        /// <summary>
+        /// The position of parameters for this request
+        /// </summary>
+        public HttpMethodParameterPosition? ParameterPosition { get; set; }
+        /// <summary>
+        /// The array serialization type for this request
+        /// </summary>
+        public ArrayParametersSerialization? ArraySerialization { get; set; }
+
+        // Rate limiting
+        
+        /// <summary>
+        /// Request weight
+        /// </summary>
+        public int Weight { get; set; } = 1;
+        /// <summary>
+        /// Rate limit gate to use
+        /// </summary>
+        public IRateLimitGate? RateLimitGate { get; set; }
+        /// <summary>
+        /// Rate limit for this specific endpoint
+        /// </summary>
+        public int? EndpointLimitCount { get; set; }
+        /// <summary>
+        /// Rate limit period for this specific endpoint
+        /// </summary>
+        public TimeSpan? EndpointLimitPeriod { get; set; }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="method"></param>
+        public RequestDefinition(string path, HttpMethod method)
+        {
+            Path = path;
+            Method = method;
+        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return _stringRep ??= $"{Method} {Path}{(Authenticated ? " authenticated" : "")}";
+        }
+    }
+}

CryptoExchange.Net/Objects/RequestDefinitionCache.cs

@@ -0,0 +1,84 @@
+using CryptoExchange.Net.RateLimiting.Interfaces;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Net.Http;
+
+namespace CryptoExchange.Net.Objects
+{
+    /// <summary>
+    /// Request definitions cache
+    /// </summary>
+    public class RequestDefinitionCache
+    {
+        private readonly ConcurrentDictionary<string, RequestDefinition> _definitions = new();
+
+        /// <summary>
+        /// Get a definition if it is already in the cache or create a new definition and add it to the cache
+        /// </summary>
+        /// <param name="method">The HttpMethod</param>
+        /// <param name="path">Endpoint path</param>
+        /// <param name="authenticated">Endpoint is authenticated</param>
+        /// <returns></returns>
+        public RequestDefinition GetOrCreate(HttpMethod method, string path, bool authenticated = false)
+            => GetOrCreate(method, path, null, 0, authenticated, null, null, null, null, null);
+
+        /// <summary>
+        /// Get a definition if it is already in the cache or create a new definition and add it to the cache
+        /// </summary>
+        /// <param name="method">The HttpMethod</param>
+        /// <param name="path">Endpoint path</param>
+        /// <param name="rateLimitGate">The rate limit gate</param>
+        /// <param name="weight">Request weight</param>
+        /// <param name="authenticated">Endpoint is authenticated</param>
+        /// <returns></returns>
+        public RequestDefinition GetOrCreate(HttpMethod method, string path, IRateLimitGate rateLimitGate, int weight = 1, bool authenticated = false)
+            => GetOrCreate(method, path, rateLimitGate,  weight, authenticated, null, null, null, null, null);
+
+        /// <summary>
+        /// Get a definition if it is already in the cache or create a new definition and add it to the cache
+        /// </summary>
+        /// <param name="method">The HttpMethod</param>
+        /// <param name="path">Endpoint path</param>
+        /// <param name="rateLimitGate">The rate limit gate</param>
+        /// <param name="endpointLimitCount">The limit count for this specific endpoint</param>
+        /// <param name="endpointLimitPeriod">The period for the limit for this specific endpoint</param>
+        /// <param name="weight">Request weight</param>
+        /// <param name="authenticated">Endpoint is authenticated</param>
+        /// <param name="requestBodyFormat">Request body format</param>
+        /// <param name="parameterPosition">Parameter position</param>
+        /// <param name="arraySerialization">Array serialization type</param>
+        /// <returns></returns>
+        public RequestDefinition GetOrCreate(
+            HttpMethod method,
+            string path,
+            IRateLimitGate? rateLimitGate,
+            int weight,
+            bool authenticated,
+            int? endpointLimitCount = null,
+            TimeSpan? endpointLimitPeriod = null,
+            RequestBodyFormat? requestBodyFormat = null,
+            HttpMethodParameterPosition? parameterPosition = null,
+            ArrayParametersSerialization? arraySerialization = null)
+        {
+
+            if (!_definitions.TryGetValue(method + path, out var def))
+            {
+                def = new RequestDefinition(path, method)
+                {
+                    Authenticated = authenticated,
+                    EndpointLimitCount = endpointLimitCount,
+                    EndpointLimitPeriod = endpointLimitPeriod,
+                    RateLimitGate = rateLimitGate,
+                    Weight = weight,
+                    ArraySerialization = arraySerialization,
+                    RequestBodyFormat = requestBodyFormat,
+                    ParameterPosition = parameterPosition,
+                };
+                _definitions.TryAdd(method + path, def);
+            }
+
+            return def;
+        }
+    }
+}

CryptoExchange.Net/Objects/Sockets/DataEvent.cs

@@ -1,7 +1,6 @@
-using CryptoExchange.Net.Objects;
-using System;
+using System;
 
-namespace CryptoExchange.Net.Sockets
+namespace CryptoExchange.Net.Objects.Sockets
 {
     /// <summary>
     /// An update received from a socket update subscription

CryptoExchange.Net/Objects/Sockets/UpdateSubscription.cs

@@ -1,8 +1,8 @@
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Sockets;
 using System;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Sockets
+namespace CryptoExchange.Net.Objects.Sockets
 {
     /// <summary>
     /// Subscription to a data stream
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.Sockets
     public class UpdateSubscription
     {
         private readonly SocketConnection _connection;
-        private readonly SocketSubscription _subscription;
+        private readonly Subscription _listener;
 
         /// <summary>
         /// Event when the connection is lost. The socket will automatically reconnect when possible.
@@ -64,8 +64,8 @@ namespace CryptoExchange.Net.Sockets
         /// </summary>
         public event Action<Exception> Exception
         {
-            add => _subscription.Exception += value;
-            remove => _subscription.Exception -= value;
+            add => _listener.Exception += value;
+            remove => _listener.Exception -= value;
         }
 
         /// <summary>
@@ -76,26 +76,26 @@ namespace CryptoExchange.Net.Sockets
         /// <summary>
         /// The id of the subscription
         /// </summary>
-        public int Id => _subscription.Id;
+        public int Id => _listener.Id;
 
         /// <summary>
         /// ctor
         /// </summary>
         /// <param name="connection">The socket connection the subscription is on</param>
         /// <param name="subscription">The subscription</param>
-        public UpdateSubscription(SocketConnection connection, SocketSubscription subscription)
+        public UpdateSubscription(SocketConnection connection, Subscription subscription)
         {
-            this._connection = connection;
-            this._subscription = subscription;
+            _connection = connection;
+            _listener = subscription;
         }
-        
+
         /// <summary>
         /// Close the subscription
         /// </summary>
         /// <returns></returns>
         public Task CloseAsync()
         {
-            return _connection.CloseAsync(_subscription);
+            return _connection.CloseAsync(_listener);
         }
 
         /// <summary>
@@ -113,16 +113,16 @@ namespace CryptoExchange.Net.Sockets
         /// <returns></returns>
         internal async Task UnsubscribeAsync()
         {
-            await _connection.UnsubscribeAsync(_subscription).ConfigureAwait(false);
+            await _connection.UnsubscribeAsync(_listener).ConfigureAwait(false);
         }
 
         /// <summary>
         /// Resubscribe this subscription
         /// </summary>
         /// <returns></returns>
-        internal async Task<CallResult<bool>> ResubscribeAsync()
+        internal async Task<CallResult> ResubscribeAsync()
         {
-            return await _connection.ResubscribeAsync(_subscription).ConfigureAwait(false);
+            return await _connection.ResubscribeAsync(_listener).ConfigureAwait(false);
         }
     }
 }