diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index a942416..98f60bc 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -8,7 +8,7 @@ steps:
   - task: DotNetCoreInstaller@0
     inputs:
       packageType: 'sdk'
-      version: '3.0.100-preview4-011223'
+      version: '3.0.100-preview6-012264'
 
   - task: DotNetCoreCLI@2
     inputs:
diff --git a/.vsts-release.yml b/.vsts-release.yml
index a25a902..cc07180 100644
--- a/.vsts-release.yml
+++ b/.vsts-release.yml
@@ -8,7 +8,7 @@ steps:
   - task: DotNetCoreInstaller@0
     inputs:
       packageType: 'sdk'
-      version: '3.0.100-preview4-011223'
+      version: '3.0.100-preview6-012264'
 
   - task: DotNetCoreCLI@2
     inputs:
diff --git a/global.json b/global.json
index cb4df9f..cd8762c 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-      "version": "3.0.100-preview4-011223"
+      "version": "3.0.100-preview6-012264"
   }
 }
\ No newline at end of file
diff --git a/src/Blazor.Extensions.SignalR/Blazor.Extensions.SignalR.csproj b/src/Blazor.Extensions.SignalR/Blazor.Extensions.SignalR.csproj
index 7d74033..f16e6ec 100644
--- a/src/Blazor.Extensions.SignalR/Blazor.Extensions.SignalR.csproj
+++ b/src/Blazor.Extensions.SignalR/Blazor.Extensions.SignalR.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview4-19216-03" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview6.19307.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Blazor.Extensions.SignalR/HubConnection.cs b/src/Blazor.Extensions.SignalR/HubConnection.cs
index be39f94..28a6a77 100644
--- a/src/Blazor.Extensions.SignalR/HubConnection.cs
+++ b/src/Blazor.Extensions.SignalR/HubConnection.cs
@@ -1,6 +1,7 @@
 using Microsoft.JSInterop;
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace Blazor.Extensions
@@ -20,63 +21,63 @@ public class HubConnection : IDisposable
         internal HttpConnectionOptions Options { get; }
         internal string InternalConnectionId { get; }
 
-        private Dictionary<string, Dictionary<string, HubMethodCallback>> _callbacks = new Dictionary<string, Dictionary<string, HubMethodCallback>>();
+        private Dictionary<string, Dictionary<string, HubMethodCallback>> callbacks = new Dictionary<string, Dictionary<string, HubMethodCallback>>();
 
-        private HubCloseCallback _closeCallback;
-        private IJSRuntime _runtime;
+        private HubCloseCallback closeCallback;
+        private IJSRuntime runtime;
 
         public HubConnection(IJSRuntime runtime, HttpConnectionOptions options)
         {
-            this._runtime = runtime;
+            this.runtime = runtime;
             this.Options = options;
             this.InternalConnectionId = Guid.NewGuid().ToString();
             runtime.InvokeSync<object>(CREATE_CONNECTION_METHOD,
                 this.InternalConnectionId,
-                new DotNetObjectRef(this.Options));
+                DotNetObjectRef.Create(this.Options));
         }
 
 
-        public Task StartAsync() => this._runtime.InvokeAsync<object>(START_CONNECTION_METHOD, this.InternalConnectionId);
-        public Task StopAsync() => this._runtime.InvokeAsync<object>(STOP_CONNECTION_METHOD, this.InternalConnectionId);
+        public Task StartAsync() => this.runtime.InvokeAsync<object>(START_CONNECTION_METHOD, this.InternalConnectionId);
+        public Task StopAsync() => this.runtime.InvokeAsync<object>(STOP_CONNECTION_METHOD, this.InternalConnectionId);
 
         public IDisposable On<TResult1>(string methodName, Func<TResult1, Task> handler)
-            => On<TResult1, object, object, object, object, object, object, object, object, object>(methodName,
+            => this.On<TResult1, object, object, object, object, object, object, object, object, object>(methodName,
                 (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1));
 
         public IDisposable On<TResult1, TResult2>(string methodName, Func<TResult1, TResult2, Task> handler)
-            => On<TResult1, TResult2, object, object, object, object, object, object, object, object>(methodName,
+            => this.On<TResult1, TResult2, object, object, object, object, object, object, object, object>(methodName,
                 (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2));
 
         public IDisposable On<TResult1, TResult2, TResult3>(string methodName, Func<TResult1, TResult2, TResult3, Task> handler)
-            => On<TResult1, TResult2, TResult3, object, object, object, object, object, object, object>(methodName,
+            => this.On<TResult1, TResult2, TResult3, object, object, object, object, object, object, object>(methodName,
                 (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3));
 
         public IDisposable On<TResult1, TResult2, TResult3, TResult4>(string methodName, Func<TResult1, TResult2, TResult3, TResult4, Task> handler)
-            => On<TResult1, TResult2, TResult3, TResult4, object, object, object, object, object, object>(methodName,
+            => this.On<TResult1, TResult2, TResult3, TResult4, object, object, object, object, object, object>(methodName,
                 (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4));
 
         public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5>(string methodName, Func<TResult1, TResult2, TResult3, TResult4, TResult5, Task> handler)
-            => On<TResult1, TResult2, TResult3, TResult4, TResult5, object, object, object, object, object>(methodName,
+            => this.On<TResult1, TResult2, TResult3, TResult4, TResult5, object, object, object, object, object>(methodName,
                 (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4, t5));
 
         public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6>(string methodName,
             Func<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, Task> handler)
-            => On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, object, object, object, object>(methodName,
+            => this.On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, object, object, object, object>(methodName,
                 (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4, t5, t6));
 
         public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7>(string methodName,
             Func<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, Task> handler)
-            => On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, object, object, object>(methodName,
+            => this.On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, object, object, object>(methodName,
                 (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4, t5, t6, t7));
 
         public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8>(string methodName,
             Func<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, Task> handler)
-            => On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, object, object>(methodName,
+            => this.On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, object, object>(methodName,
                 (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4, t5, t6, t7, t8));
 
         public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, TResult9>(string methodName,
             Func<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, TResult9, Task> handler)
-            => On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, TResult9, object>(methodName,
+            => this.On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, TResult9, object>(methodName,
                 (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4, t5, t6, t7, t8, t9));
 
         public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, TResult9, TResult10>(string methodName,
@@ -103,84 +104,84 @@ public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6
 
                      if (payloads.Length > 0)
                      {
-                         t1 = Json.Deserialize<TResult1>(payloads[0]);
+                         t1 = JsonSerializer.Parse<TResult1>(payloads[0]);
                      }
                      if (payloads.Length > 1)
                      {
-                         t2 = Json.Deserialize<TResult2>(payloads[1]);
+                         t2 = JsonSerializer.Parse<TResult2>(payloads[1]);
                      }
                      if (payloads.Length > 2)
                      {
-                         t3 = Json.Deserialize<TResult3>(payloads[2]);
+                         t3 = JsonSerializer.Parse<TResult3>(payloads[2]);
                      }
                      if (payloads.Length > 3)
                      {
-                         t4 = Json.Deserialize<TResult4>(payloads[3]);
+                         t4 = JsonSerializer.Parse<TResult4>(payloads[3]);
                      }
                      if (payloads.Length > 4)
                      {
-                         t5 = Json.Deserialize<TResult5>(payloads[4]);
+                         t5 = JsonSerializer.Parse<TResult5>(payloads[4]);
                      }
                      if (payloads.Length > 5)
                      {
-                         t6 = Json.Deserialize<TResult6>(payloads[5]);
+                         t6 = JsonSerializer.Parse<TResult6>(payloads[5]);
                      }
                      if (payloads.Length > 6)
                      {
-                         t7 = Json.Deserialize<TResult7>(payloads[6]);
+                         t7 = JsonSerializer.Parse<TResult7>(payloads[6]);
                      }
                      if (payloads.Length > 7)
                      {
-                         t8 = Json.Deserialize<TResult8>(payloads[7]);
+                         t8 = JsonSerializer.Parse<TResult8>(payloads[7]);
                      }
                      if (payloads.Length > 8)
                      {
-                         t9 = Json.Deserialize<TResult9>(payloads[8]);
+                         t9 = JsonSerializer.Parse<TResult9>(payloads[8]);
                      }
                      if (payloads.Length > 9)
                      {
-                         t10 = Json.Deserialize<TResult10>(payloads[9]);
+                         t10 = JsonSerializer.Parse<TResult10>(payloads[9]);
                      }
 
                      return handler(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10);
                  }
             );
 
-            RegisterHandle(methodName, callback);
+            this.RegisterHandle(methodName, callback);
 
             return callback;
         }
 
         internal void RegisterHandle(string methodName, HubMethodCallback callback)
         {
-            if (this._callbacks.TryGetValue(methodName, out var methodHandlers))
+            if (this.callbacks.TryGetValue(methodName, out var methodHandlers))
             {
                 methodHandlers[callback.Id] = callback;
             }
             else
             {
-                this._callbacks[methodName] = new Dictionary<string, HubMethodCallback>
+                this.callbacks[methodName] = new Dictionary<string, HubMethodCallback>
                 {
                     { callback.Id, callback }
                 };
             }
 
-            this._runtime.InvokeSync<object>(ON_METHOD, this.InternalConnectionId, new DotNetObjectRef(callback));
+            this.runtime.InvokeSync<object>(ON_METHOD, this.InternalConnectionId, DotNetObjectRef.Create(callback));
         }
 
         internal void RemoveHandle(string methodName, string callbackId)
         {
-            if (this._callbacks.TryGetValue(methodName, out var callbacks))
+            if (this.callbacks.TryGetValue(methodName, out var callbacks))
             {
                 if (callbacks.TryGetValue(callbackId, out var callback))
                 {
-                    this._runtime.InvokeSync<object>(OFF_METHOD, this.InternalConnectionId, methodName, callbackId);
+                    this.runtime.InvokeSync<object>(OFF_METHOD, this.InternalConnectionId, methodName, callbackId);
                     //HubConnectionManager.Off(this.InternalConnectionId, handle.Item1);
                     callbacks.Remove(callbackId);
 
                     if (callbacks.Count == 0)
                     {
-                        this._callbacks.Remove(methodName);
+                        this.callbacks.Remove(methodName);
                     }
                 }
             }
@@ -188,18 +189,18 @@ internal void RemoveHandle(string methodName, string callbackId)
 
         public void OnClose(Func<Exception, Task> callback)
         {
-            this._closeCallback = new HubCloseCallback(callback);
-            this._runtime.InvokeSync<object>(ON_CLOSE_METHOD,
+            this.closeCallback = new HubCloseCallback(callback);
+            this.runtime.InvokeSync<object>(ON_CLOSE_METHOD,
                 this.InternalConnectionId,
-                new DotNetObjectRef(this._closeCallback));
+                DotNetObjectRef.Create(this.closeCallback));
         }
 
         public Task InvokeAsync(string methodName, params object[] args) =>
-            this._runtime.InvokeAsync<object>(INVOKE_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
+            this.runtime.InvokeAsync<object>(INVOKE_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
 
         public Task<TResult> InvokeAsync<TResult>(string methodName, params object[] args) =>
-            this._runtime.InvokeAsync<TResult>(INVOKE_WITH_RESULT_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
+            this.runtime.InvokeAsync<TResult>(INVOKE_WITH_RESULT_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
 
-        public void Dispose() => this._runtime.InvokeSync<object>(REMOVE_CONNECTION_METHOD, this.InternalConnectionId);
+        public void Dispose() => this.runtime.InvokeSync<object>(REMOVE_CONNECTION_METHOD, this.InternalConnectionId);
     }
 }
diff --git a/test/Blazor.Extensions.SignalR.Test.Client/Blazor.Extensions.SignalR.Test.Client.csproj b/test/Blazor.Extensions.SignalR.Test.Client/Blazor.Extensions.SignalR.Test.Client.csproj
index dc8390e..321f7ab 100644
--- a/test/Blazor.Extensions.SignalR.Test.Client/Blazor.Extensions.SignalR.Test.Client.csproj
+++ b/test/Blazor.Extensions.SignalR.Test.Client/Blazor.Extensions.SignalR.Test.Client.csproj
@@ -10,8 +10,8 @@
     <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Blazor.Extensions.SignalR.Test.Client/Pages/Chat.razor b/test/Blazor.Extensions.SignalR.Test.Client/Pages/Chat.razor
index b6b292a..223e31c 100644
--- a/test/Blazor.Extensions.SignalR.Test.Client/Pages/Chat.razor
+++ b/test/Blazor.Extensions.SignalR.Test.Client/Pages/Chat.razor
@@ -5,7 +5,7 @@
 <h4>Serialization Test</h4>
 <form class="form-inline">
     <div class="input-append">
-        <input type="button" class="btn" value="Gimme objects!" onclick=@TellHubToDoStuff />
+        <input type="button" class="btn" value="Gimme objects!" @onclick=@TellHubToDoStuff />
 
     </div>
 </form>
@@ -13,7 +13,7 @@
 <h4>Multiple Arguments</h4>
 <form class="form-inline">
     <div class="input-append">
-        <input type="button" class="btn" value="Gimme multiple arguments!" onclick=@DoMultipleArgs />
+        <input type="button" class="btn" value="Gimme multiple arguments!" @onclick=@DoMultipleArgs />
 
     </div>
 </form>
@@ -21,7 +21,7 @@
 <h4>Byte array Arguments</h4>
 <form class="form-inline">
     <div class="input-append">
-        <input type="button" class="btn" value="Gimme byte array arguments!" onclick=@DoByteArrayArg />
+        <input type="button" class="btn" value="Gimme byte array arguments!" @onclick=@DoByteArrayArg />
 
     </div>
 </form>
@@ -29,44 +29,44 @@
 <h4>To Everybody</h4>
 <form class="form-inline">
     <div class="input-append">
-        <input type="text" id="message-text" placeholder="Type a message" bind=@_toEverybody />
-        <input type="button" id="broadcast" class="btn" value="Broadcast" onclick=@Broadcast />
-        <input type="button" id="broadcast-exceptme" class="btn" value="Broadcast (Others)" onclick=@SendToOthers />
+        <input type="text" id="message-text" placeholder="Type a message" @bind=@ToEverybody />
+        <input type="button" id="broadcast" class="btn" value="Broadcast" @onclick=@Broadcast />
+        <input type="button" id="broadcast-exceptme" class="btn" value="Broadcast (Others)" @onclick=@SendToOthers />
     </div>
 </form>
 
 <h4>To Connection</h4>
 <form class="form-inline">
     <div class="input-prepend input-append">
-        <input type="text" name="connection-message" id="connection-message-text" placeholder="Type a message" bind=@_toConnection />
-        <input type="text" name="connection-id" id="connection-id" placeholder="Type a connection id" bind=@_connectionId />
-        <input type="button" id="connection-send" class="btn" value="Send to Connection" onclick=@SendToConnection />
+        <input type="text" name="connection-message" id="connection-message-text" placeholder="Type a message"@bind=@ToConnection />
+        <input type="text" name="connection-id" id="connection-id" placeholder="Type a connection id"@bind=@ConnectionId />
+        <input type="button" id="connection-send" class="btn" value="Send to Connection" @onclick=@SendToConnection />
     </div>
 </form>
 
 <h4>To Me</h4>
 <form class="form-inline">
     <div class="input-append">
-        <input type="text" id="me-message-text" placeholder="Type a message" bind=@_toMe />
-        <input type="button" id="send" class="btn" value="Send to Me" onclick=@SendToMe />
+        <input type="text" id="me-message-text" placeholder="Type a message"@bind=@ToMe />
+        <input type="button" id="send" class="btn" value="Send to Me" @onclick=@SendToMe />
     </div>
 </form>
 
 <h4>Group Actions</h4>
 <form class="form-inline">
     <div class="input-prepend input-append">
-        <input type="text" name="group-message" id="group-message-text" placeholder="Type a message" bind=@_toGroup />
-        <input type="text" name="group-name" id="group-name" placeholder="Type a group name" bind=@_groupName />
-        <input type="button" id="groupmsg" class="btn" value="Send to Group" onclick=@SendToGroup />
-        <input type="button" id="others-groupmsg" class="btn" value="Send to Others in Group" onclick=@SendToOthersInGroup />
-        <input type="button" id="join-group" class="btn" value="Join Group" onclick=@JoinGroup />
-        <input type="button" id="leave-group" class="btn" value="Leave Group" onclick=@LeaveGroup />
+        <input type="text" name="group-message" id="group-message-text" placeholder="Type a message"@bind=@ToGroup />
+        <input type="text" name="group-name" id="group-name" placeholder="Type a group name"@bind=@GroupName />
+        <input type="button" id="groupmsg" class="btn" value="Send to Group" @onclick=@SendToGroup />
+        <input type="button" id="others-groupmsg" class="btn" value="Send to Others in Group" @onclick=@SendToOthersInGroup />
+        <input type="button" id="join-group" class="btn" value="Join Group" @onclick=@JoinGroup />
+        <input type="button" id="leave-group" class="btn" value="Leave Group" @onclick=@LeaveGroup />
 
     </div>
 </form>
 
 <ul id="message-list">
-    @foreach (var msg in _messages)
+    @foreach (var msg in Messages)
     {
         <li>@msg</li>
     }
diff --git a/test/Blazor.Extensions.SignalR.Test.Client/Pages/ChatComponent.cs b/test/Blazor.Extensions.SignalR.Test.Client/Pages/ChatComponent.cs
index f92a8e9..9015226 100644
--- a/test/Blazor.Extensions.SignalR.Test.Client/Pages/ChatComponent.cs
+++ b/test/Blazor.Extensions.SignalR.Test.Client/Pages/ChatComponent.cs
@@ -13,16 +13,16 @@ public class ChatComponent : ComponentBase
         [Inject] private HttpClient _http { get; set; }
         [Inject] private HubConnectionBuilder _hubConnectionBuilder { get; set; }
 //        [Inject] private ILogger<ChatComponent> _logger { get; set; }
-        internal string _toEverybody { get; set; }
-        internal string _toConnection { get; set; }
-        internal string _connectionId { get; set; }
-        internal string _toMe { get; set; }
-        internal string _toGroup { get; set; }
-        internal string _groupName { get; set; }
-        internal List<string> _messages { get; set; } = new List<string>();
-
-        private IDisposable _objectHandle;
-        private IDisposable _listHandle;
+        internal string ToEverybody { get; set; }
+        internal string ToConnection { get; set; }
+        internal string ConnectionId { get; set; }
+        internal string ToMe { get; set; }
+        internal string ToGroup { get; set; }
+        internal string GroupName { get; set; }
+        internal List<string> Messages { get; set; } = new List<string>();
+
+        private IDisposable objectHandle;
+        private IDisposable listHandle;
         private IDisposable _multiArgsHandle;
         private IDisposable _multiArgsComplexHandle;
         private IDisposable _byteArrayHandle;
@@ -44,7 +44,7 @@ protected override async Task OnInitAsync()
                         return token;
                     };
                 })
-                .AddMessagePackProtocol()
+                //.AddMessagePackProtocol()
                 .Build();
 
             this._connection.On<string>("Send", this.Handle);
@@ -60,7 +60,7 @@ public Task DemoMethodObject(object data)
         {
             Console.WriteLine("Got object!");
             Console.WriteLine(data?.GetType().FullName ?? "<NULL>");
-            this._objectHandle.Dispose();
+            this.objectHandle.Dispose();
             if (data == null) return Task.CompletedTask;
             return this.Handle(data);
         }
@@ -69,7 +69,7 @@ public Task DemoMethodList(object data)
         {
             Console.WriteLine("Got List!");
             Console.WriteLine(data?.GetType().FullName ?? "<NULL>");
-            this._listHandle.Dispose();
+            this.listHandle.Dispose();
             if (data == null) return Task.CompletedTask;
             return this.Handle(data);
         }
@@ -108,7 +108,7 @@ private async Task<string> GetJwtToken(string userId)
         private Task Handle(object msg)
         {
             Console.WriteLine(msg);
-            this._messages.Add(msg.ToString());
+            this.Messages.Add(msg.ToString());
             this.StateHasChanged();
             return Task.CompletedTask;
         }
@@ -118,49 +118,49 @@ private Task HandleArgs(params object[] args)
             string msg = string.Join(", ", args);
 
             Console.WriteLine(msg);
-            this._messages.Add(msg);
+            this.Messages.Add(msg);
             this.StateHasChanged();
             return Task.CompletedTask;
         }
 
         internal async Task Broadcast()
         {
-            await this._connection.InvokeAsync("Send", this._toEverybody);
+            await this._connection.InvokeAsync("Send", this.ToEverybody);
         }
 
         internal async Task SendToOthers()
         {
-            await this._connection.InvokeAsync("SendToOthers", this._toEverybody);
+            await this._connection.InvokeAsync("SendToOthers", this.ToEverybody);
         }
 
         internal async Task SendToConnection()
         {
-            await this._connection.InvokeAsync("SendToConnection", this._connectionId, this._toConnection);
+            await this._connection.InvokeAsync("SendToConnection", this.ConnectionId, this.ToConnection);
         }
 
         internal async Task SendToMe()
         {
-            await this._connection.InvokeAsync("Echo", this._toMe);
+            await this._connection.InvokeAsync("Echo", this.ToMe);
         }
 
         internal async Task SendToGroup()
         {
-            await this._connection.InvokeAsync("SendToGroup", this._groupName, this._toGroup);
+            await this._connection.InvokeAsync("SendToGroup", this.GroupName, this.ToGroup);
         }
 
         internal async Task SendToOthersInGroup()
         {
-            await this._connection.InvokeAsync("SendToOthersInGroup", this._groupName, this._toGroup);
+            await this._connection.InvokeAsync("SendToOthersInGroup", this.GroupName, this.ToGroup);
         }
 
         internal async Task JoinGroup()
         {
-            await this._connection.InvokeAsync("JoinGroup", this._groupName);
+            await this._connection.InvokeAsync("JoinGroup", this.GroupName);
         }
 
         internal async Task LeaveGroup()
         {
-            await this._connection.InvokeAsync("LeaveGroup", this._groupName);
+            await this._connection.InvokeAsync("LeaveGroup", this.GroupName);
         }
 
         internal async Task DoMultipleArgs()
@@ -181,8 +181,8 @@ internal async Task DoByteArrayArg()
 
         internal async Task TellHubToDoStuff()
         {
-            this._objectHandle = this._connection.On<DemoData>("DemoMethodObject", this.DemoMethodObject);
-            this._listHandle = this._connection.On<DemoData[]>("DemoMethodList", this.DemoMethodList);
+            this.objectHandle = this._connection.On<DemoData>("DemoMethodObject", this.DemoMethodObject);
+            this.listHandle = this._connection.On<DemoData[]>("DemoMethodList", this.DemoMethodList);
             await this._connection.InvokeAsync("DoSomething");
         }
     }
diff --git a/test/Blazor.Extensions.SignalR.Test.Client/Shared/NavMenu.razor b/test/Blazor.Extensions.SignalR.Test.Client/Shared/NavMenu.razor
index 991ab68..6182ba0 100644
--- a/test/Blazor.Extensions.SignalR.Test.Client/Shared/NavMenu.razor
+++ b/test/Blazor.Extensions.SignalR.Test.Client/Shared/NavMenu.razor
@@ -2,12 +2,12 @@
 
 <div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="/">Blazor.Extensions.SignalR.Test</a>
-    <button class="navbar-toggler" onclick=@ToggleNavMenu>
+    <button class="navbar-toggler" @onclick=@ToggleNavMenu>
         <span class="navbar-toggler-icon"></span>
     </button>
 </div>
 
-<div class=@(collapseNavMenu ? "collapse" : null) onclick=@ToggleNavMenu>
+<div class=@(collapseNavMenu ? "collapse" : null) @onclick=@ToggleNavMenu>
     <ul class="nav flex-column">
         <li class="nav-item px-3">
             <NavLink class="nav-link" href="/" Match="NavLinkMatch.All">
@@ -17,7 +17,7 @@
     </ul>
 </div>
 
-@functions {
+@code {
     bool collapseNavMenu = true;
 
     void ToggleNavMenu()
diff --git a/test/Blazor.Extensions.SignalR.Test.Server/Blazor.Extensions.SignalR.Test.Server.csproj b/test/Blazor.Extensions.SignalR.Test.Server/Blazor.Extensions.SignalR.Test.Server.csproj
index eaaf5f3..4c2ed53 100644
--- a/test/Blazor.Extensions.SignalR.Test.Server/Blazor.Extensions.SignalR.Test.Server.csproj
+++ b/test/Blazor.Extensions.SignalR.Test.Server/Blazor.Extensions.SignalR.Test.Server.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0-preview4-19216-03" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview4-19216-03" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0-preview6.19307.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview6.19307.2" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Server" Version="3.0.0-preview3-19153-02" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview4-19216-03" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.0" />
   </ItemGroup>
 
diff --git a/test/Blazor.Extensions.SignalR.Test.Server/Startup.cs b/test/Blazor.Extensions.SignalR.Test.Server/Startup.cs
index 507db35..3ea88d9 100644
--- a/test/Blazor.Extensions.SignalR.Test.Server/Startup.cs
+++ b/test/Blazor.Extensions.SignalR.Test.Server/Startup.cs
@@ -33,8 +33,8 @@ public void ConfigureServices(IServiceCollection services)
             services.AddConnections();
             services
                 .AddSignalR(options => options.KeepAliveInterval = TimeSpan.FromSeconds(5))
-                .AddMessagePackProtocol();
-                //.AddJsonProtocol();
+                //.AddMessagePackProtocol();
+                .AddJsonProtocol();
 
             services.AddAuthorization(options =>
             {
@@ -106,22 +106,21 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseHsts();
             }
 
+            app.UseAuthorization();
             app.UseHttpsRedirection();
             app.UseCookiePolicy();
             app.UseCors("CorsPolicy");
-            app.UseSignalR(routes =>
-            {
-                routes.MapHub<ChatHub>("/chathub");
-            });
+
+            app.UseClientSideBlazorFiles<Client.Startup>();
 
             app.UseRouting();
 
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapDefaultControllerRoute();
+                endpoints.MapHub<ChatHub>("/chathub");
+                endpoints.MapFallbackToClientSideBlazor<Client.Startup>("index.html");
             });
-
-            app.UseBlazor<Client.Program>();
         }
     }
 }