diff --git a/CryptoExchange.Net/Clients/BaseSocketClient.cs b/CryptoExchange.Net/Clients/BaseSocketClient.cs
index 61c877e..e817282 100644
--- a/CryptoExchange.Net/Clients/BaseSocketClient.cs
+++ b/CryptoExchange.Net/Clients/BaseSocketClient.cs
@@ -101,7 +101,7 @@ namespace CryptoExchange.Net
         public string GetSubscriptionsState()
         {
             var result = new StringBuilder();
-            foreach (var client in ApiClients.OfType<SocketApiClient>())
+            foreach (var client in ApiClients.OfType<SocketApiClient>().Where(c => c.CurrentSubscriptions > 0))
             {
                 result.AppendLine(client.GetSubscriptionsState());
             }
diff --git a/CryptoExchange.Net/Clients/CryptoBaseClient.cs b/CryptoExchange.Net/Clients/CryptoBaseClient.cs
new file mode 100644
index 0000000..d7db31e
--- /dev/null
+++ b/CryptoExchange.Net/Clients/CryptoBaseClient.cs
@@ -0,0 +1,75 @@
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Interfaces.CommonClients;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+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)
+        {
+            if (_serviceProvider == null)
+            {
+                // Create with default options
+                var createResult = createFunc();
+                _serviceCache.Add(typeof(T), createResult!);
+                return createResult;
+            }
+
+            var type = typeof(T);
+            if (_serviceCache.TryGetValue(type, out var value))
+                return (T)value;
+
+            var result = _serviceProvider.GetRequiredService<T>();
+            if (result == null)
+            {
+                // Does this mean the AddXX() hasn't been done?
+            }
+
+            _serviceCache.Add(type, result!);
+            return result;
+        }
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            _serviceCache.Clear();
+        }
+    }
+}
diff --git a/CryptoExchange.Net/Clients/CryptoExchangeClient.cs b/CryptoExchange.Net/Clients/CryptoExchangeClient.cs
deleted file mode 100644
index 61b3874..0000000
--- a/CryptoExchange.Net/Clients/CryptoExchangeClient.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Interfaces.CommonClients;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace CryptoExchange.Net.Clients
-{
-    public class CryptoExchangeClient : ICryptoExchangeClient, IDisposable
-    {
-        private Dictionary<Type, object?> _serviceCache = new Dictionary<Type, object?>();
-
-        private readonly IServiceProvider _serviceProvider;
-
-        public CryptoExchangeClient(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-            _serviceCache = new Dictionary<Type, object?>();
-        }
-
-        public IEnumerable<ISpotClient> GetSpotClients()
-        {
-            return _serviceProvider.GetServices<ISpotClient>().ToList();
-        }
-
-        public T? TryGet<T>()
-        {
-            var type = typeof(T);
-            if (_serviceCache.TryGetValue(type, out var value))
-                return (T?)value;
-
-            var result = _serviceProvider.GetService<T>();
-            _serviceCache.Add(type, result);
-            return result;
-        }
-
-        public void Dispose()
-        {
-            _serviceCache.Clear();
-        }
-    }
-}
diff --git a/CryptoExchange.Net/Clients/CryptoRestClient.cs b/CryptoExchange.Net/Clients/CryptoRestClient.cs
new file mode 100644
index 0000000..7b51222
--- /dev/null
+++ b/CryptoExchange.Net/Clients/CryptoRestClient.cs
@@ -0,0 +1,34 @@
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Interfaces.CommonClients;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CryptoExchange.Net.Clients
+{
+    /// <inheritdoc />
+    public class CryptoRestClient : CryptoBaseClient, ICryptoRestClient
+    {
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="serviceProvider"></param>
+        public CryptoRestClient(IServiceProvider serviceProvider) : base(serviceProvider)
+        {
+        }
+
+        /// <summary>
+        /// Try get a client by type for the service collection
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<ISpotClient> GetSpotClients()
+        {
+            if (_serviceProvider == null)
+                return new List<ISpotClient>();
+
+            return _serviceProvider.GetServices<ISpotClient>().ToList();
+        }
+    }
+}
diff --git a/CryptoExchange.Net/Clients/CryptoSocketClient.cs b/CryptoExchange.Net/Clients/CryptoSocketClient.cs
new file mode 100644
index 0000000..28af548
--- /dev/null
+++ b/CryptoExchange.Net/Clients/CryptoSocketClient.cs
@@ -0,0 +1,22 @@
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Interfaces.CommonClients;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CryptoExchange.Net.Clients
+{
+    /// <inheritdoc />
+    public class CryptoSocketClient : CryptoBaseClient, ICryptoSocketClient
+    {
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="serviceProvider"></param>
+        public CryptoSocketClient(IServiceProvider serviceProvider) : base(serviceProvider)
+        {
+        }
+    }
+}
diff --git a/CryptoExchange.Net/Interfaces/ICryptoExchangeClient.cs b/CryptoExchange.Net/Interfaces/ICryptoExchangeClient.cs
deleted file mode 100644
index 1223984..0000000
--- a/CryptoExchange.Net/Interfaces/ICryptoExchangeClient.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Interfaces.CommonClients;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace CryptoExchange.Net.Clients
-{
-    public interface ICryptoExchangeClient
-    {
-        IEnumerable<ISpotClient> GetSpotClients();
-        T? TryGet<T>();
-    }
-}
diff --git a/CryptoExchange.Net/Interfaces/ICryptoRestClient.cs b/CryptoExchange.Net/Interfaces/ICryptoRestClient.cs
new file mode 100644
index 0000000..da0cf01
--- /dev/null
+++ b/CryptoExchange.Net/Interfaces/ICryptoRestClient.cs
@@ -0,0 +1,27 @@
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Interfaces.CommonClients;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace CryptoExchange.Net.Clients
+{
+    /// <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>
+        /// Try get 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        T TryGet<T>(Func<T> createFunc);
+    }
+}
diff --git a/CryptoExchange.Net/Interfaces/ICryptoSocketClient.cs b/CryptoExchange.Net/Interfaces/ICryptoSocketClient.cs
new file mode 100644
index 0000000..5fc1c6c
--- /dev/null
+++ b/CryptoExchange.Net/Interfaces/ICryptoSocketClient.cs
@@ -0,0 +1,22 @@
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Interfaces.CommonClients;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace CryptoExchange.Net.Clients
+{
+    /// <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);
+    }
+}
diff --git a/CryptoExchange.Net/Sockets/Query.cs b/CryptoExchange.Net/Sockets/Query.cs
index 045b2e3..56d3ea4 100644
--- a/CryptoExchange.Net/Sockets/Query.cs
+++ b/CryptoExchange.Net/Sockets/Query.cs
@@ -41,7 +41,7 @@ namespace CryptoExchange.Net.Sockets
         public object? Response { get; set; }
 
         /// <summary>
-        /// Action to execute when query is finished
+        /// Wait event for the calling message processing thread
         /// </summary>
         public AsyncResetEvent? ContinueAwaiter { get; set; }