diff --git a/src/Websocket.Client/IWebsocketClient.cs b/src/Websocket.Client/IWebsocketClient.cs
index 36f5ec1..7a6e75f 100644
--- a/src/Websocket.Client/IWebsocketClient.cs
+++ b/src/Websocket.Client/IWebsocketClient.cs
@@ -2,7 +2,6 @@
 using System.Net.WebSockets;
 using System.Text;
 using System.Threading.Tasks;
-using Websocket.Client.Models;
 
 namespace Websocket.Client
 {
@@ -16,6 +15,11 @@ public interface IWebsocketClient : IDisposable
         /// </summary>
         Uri Url { get; set; }
 
+        /// <summary>
+        /// Validate if an incoming message is from sub-protocol
+        /// </summary>        
+        Predicate< string> IsSubprotocolMessage { get; set; }
+
         /// <summary>
         /// Stream with received message (raw format)
         /// </summary>
diff --git a/src/Websocket.Client/Models/DisconnectionInfo.cs b/src/Websocket.Client/Models/DisconnectionInfo.cs
index 8b43dbf..98350fe 100644
--- a/src/Websocket.Client/Models/DisconnectionInfo.cs
+++ b/src/Websocket.Client/Models/DisconnectionInfo.cs
@@ -10,7 +10,7 @@ namespace Websocket.Client
     public class DisconnectionInfo
     {
         /// <inheritdoc />
-        public DisconnectionInfo(DisconnectionType type, WebSocketCloseStatus? closeStatus, 
+        public DisconnectionInfo(DisconnectionType type, WebSocketCloseStatus closeStatus,
             string closeStatusDescription, string subProtocol, Exception exception)
         {
             Type = type;
@@ -28,7 +28,7 @@ public DisconnectionInfo(DisconnectionType type, WebSocketCloseStatus? closeStat
         /// <summary>
         /// Indicates the reason why the remote endpoint initiated the close handshake 
         /// </summary>
-        public WebSocketCloseStatus? CloseStatus { get; }
+        public WebSocketCloseStatus CloseStatus { get; }
 
         /// <summary>
         /// Allows the remote endpoint to describe the reason why the connection was closed 
@@ -62,7 +62,7 @@ public DisconnectionInfo(DisconnectionType type, WebSocketCloseStatus? closeStat
         /// </summary>
         public static DisconnectionInfo Create(DisconnectionType type, WebSocket client, Exception exception)
         {
-            return new DisconnectionInfo(type, client?.CloseStatus, client?.CloseStatusDescription, 
+            return new DisconnectionInfo(type, (WebSocketCloseStatus) client?.CloseStatus, client?.CloseStatusDescription,
                 client?.SubProtocol, exception);
         }
     }
diff --git a/src/Websocket.Client/Models/DisconnectionType.cs b/src/Websocket.Client/Models/DisconnectionType.cs
index a87ccf0..f23e460 100644
--- a/src/Websocket.Client/Models/DisconnectionType.cs
+++ b/src/Websocket.Client/Models/DisconnectionType.cs
@@ -1,4 +1,5 @@
 // ReSharper disable once CheckNamespace
+
 namespace Websocket.Client
 {
     /// <summary>
@@ -19,7 +20,7 @@ public enum DisconnectionType
         /// <summary>
         /// Type used when connection to websocket was lost by not receiving any message in given time-range
         /// </summary>
-        NoMessageReceived = 2, 
+        NoMessageReceived = 2,
 
         /// <summary>
         /// Type used when connection or reconnection returned error
diff --git a/src/Websocket.Client/Models/ReconnectionInfo.cs b/src/Websocket.Client/Models/ReconnectionInfo.cs
index 2884412..ddf1e0b 100644
--- a/src/Websocket.Client/Models/ReconnectionInfo.cs
+++ b/src/Websocket.Client/Models/ReconnectionInfo.cs
@@ -1,7 +1,7 @@
 using System;
 
 // ReSharper disable once CheckNamespace
-namespace Websocket.Client.Models
+namespace Websocket.Client
 {
     /// <summary>
     /// Info about happened reconnection
diff --git a/src/Websocket.Client/Models/ReconnectionType.cs b/src/Websocket.Client/Models/ReconnectionType.cs
index 356743c..6194998 100644
--- a/src/Websocket.Client/Models/ReconnectionType.cs
+++ b/src/Websocket.Client/Models/ReconnectionType.cs
@@ -1,4 +1,5 @@
 // ReSharper disable once CheckNamespace
+
 namespace Websocket.Client
 {
     /// <summary>
@@ -19,7 +20,7 @@ public enum ReconnectionType
         /// <summary>
         /// Type used when connection to websocket was lost by not receiving any message in given time-range
         /// </summary>
-        NoMessageReceived = 2, 
+        NoMessageReceived = 2,
 
         /// <summary>
         /// Type used after unsuccessful previous reconnection
diff --git a/src/Websocket.Client/WebsocketClient.cs b/src/Websocket.Client/WebsocketClient.cs
index 0885239..ff3c007 100644
--- a/src/Websocket.Client/WebsocketClient.cs
+++ b/src/Websocket.Client/WebsocketClient.cs
@@ -10,7 +10,6 @@
 using System.Threading.Tasks;
 using Websocket.Client.Exceptions;
 using Websocket.Client.Logging;
-using Websocket.Client.Models;
 using Websocket.Client.Threading;
 
 namespace Websocket.Client
@@ -41,6 +40,34 @@ public partial class WebsocketClient : IWebsocketClient
         private readonly Subject<ReconnectionInfo> _reconnectionSubject = new Subject<ReconnectionInfo>();
         private readonly Subject<DisconnectionInfo> _disconnectedSubject = new Subject<DisconnectionInfo>();
 
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="clientFactory"></param>
+
+        public WebsocketClient(Func<ClientWebSocket> clientFactory = null)
+            : this(GetClientFactory(clientFactory))
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public WebsocketClient(Func<Uri, CancellationToken, Task<WebSocket>> connectionFactory = null)
+        {                        
+            _connectionFactory = connectionFactory ?? (async (uri, token) =>
+            {
+                //var client = new ClientWebSocket
+                //{
+                //    Options = { KeepAliveInterval = new TimeSpan(0, 0, 5, 0) }
+                //};
+                var client = new ClientWebSocket();
+                await client.ConnectAsync(uri, token).ConfigureAwait(false);
+                return client;
+            });
+        }
+
         /// <summary>
         /// A simple websocket client with built-in reconnection and error handling
         /// </summary>
@@ -165,6 +192,9 @@ public bool IsReconnectionEnabled
         /// <inheritdoc />
         public ClientWebSocket NativeClient => GetSpecificOrThrow(_client);
 
+        /// <inheritdoc />
+        public Predicate<string> IsSubprotocolMessage { get; set; } = null;
+
         /// <summary>
         /// Terminate the websocket connection and cleanup everything
         /// </summary>