diff --git a/src/SharedKernel/Extensions/HttpContextExtensions.cs b/src/SharedKernel/Extensions/HttpContextExtensions.cs
index 380303d..f128da9 100644
--- a/src/SharedKernel/Extensions/HttpContextExtensions.cs
+++ b/src/SharedKernel/Extensions/HttpContextExtensions.cs
@@ -14,6 +14,11 @@ public static void MarkAsPrivateEndpoint(this HttpResponse response)
       response.Headers.Append("X-Private-Endpoint", "1");
    }
 
+   public static void MarkAsPrivateEndpoint(this IHttpContextAccessor contextAccessor)
+   {
+      contextAccessor.HttpContext?.Response.Headers.Append("X-Private-Endpoint", "1");
+   }
+   
    public static void MarkAsPrivateEndpoint(this HttpContextAccessor contextAccessor)
    {
       contextAccessor.HttpContext?.Response.Headers.Append("X-Private-Endpoint", "1");
diff --git a/src/SharedKernel/Extensions/SignalRExtensions.cs b/src/SharedKernel/Extensions/SignalRExtensions.cs
index 7c856f5..b1ecdaf 100644
--- a/src/SharedKernel/Extensions/SignalRExtensions.cs
+++ b/src/SharedKernel/Extensions/SignalRExtensions.cs
@@ -1,5 +1,7 @@
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
+using ResponseCrafter.ExceptionHandlers.SignalR;
 using StackExchange.Redis;
 
 namespace SharedKernel.Extensions;
@@ -11,7 +13,7 @@ public static WebApplicationBuilder AddSignalR(this WebApplicationBuilder builde
    {
       builder
          .Services
-         .AddSignalR()
+         .AddSignalR(o => o.AddFilter<SignalRExceptionFilter>())
          .AddMessagePackProtocol();
 
       return builder;
@@ -21,7 +23,7 @@ public static WebApplicationBuilder AddDistributedSignalR(this WebApplicationBui
    {
       builder
          .Services
-         .AddSignalR()
+         .AddSignalR(o => o.AddFilter<SignalRExceptionFilter>())
          .AddMessagePackProtocol()
          .AddStackExchangeRedis(builder.Configuration.GetRedisUrl(),
             options =>
diff --git a/src/SharedKernel/Logging/RequestResponseLoggingMiddleware.cs b/src/SharedKernel/Logging/RequestResponseLoggingMiddleware.cs
index 2336654..d718a6b 100644
--- a/src/SharedKernel/Logging/RequestResponseLoggingMiddleware.cs
+++ b/src/SharedKernel/Logging/RequestResponseLoggingMiddleware.cs
@@ -19,7 +19,7 @@ internal class RequestResponseLoggingMiddleware(RequestDelegate next, ILogger<Re
 
    public async Task InvokeAsync(HttpContext context)
    {
-      if (context.Request.Method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))
+      if (HttpMethods.IsOptions(context.Request.Method))
       {
          await next(context);
          return;
@@ -31,6 +31,7 @@ public async Task InvokeAsync(HttpContext context)
       var originalBodyStream = context.Response.Body;
       await using var responseBody = new MemoryStream();
       context.Response.Body = responseBody;
+      
       var stopwatch = Stopwatch.GetTimestamp();
       try
       {
@@ -81,7 +82,6 @@ public async Task InvokeAsync(HttpContext context)
       var body = await reader.ReadToEndAsync();
       var sanitizedHeaders = JsonSerializer.Serialize(RedactSensitiveData(headers));
       var bodyContent = JsonSerializer.Serialize(ParseAndRedactJson(body));
-
       return (sanitizedHeaders, bodyContent);
    }
 
diff --git a/src/SharedKernel/SharedKernel.csproj b/src/SharedKernel/SharedKernel.csproj
index 2535d87..a773da3 100644
--- a/src/SharedKernel/SharedKernel.csproj
+++ b/src/SharedKernel/SharedKernel.csproj
@@ -8,13 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.0.20</Version>
+        <Version>1.0.21</Version>
         <PackageId>Pandatech.SharedKernel</PackageId>
         <Title>Pandatech Shared Kernel Library</Title>
         <PackageTags>Pandatech, shared kernel, library, OpenAPI, Swagger, utilities, scalar</PackageTags>
         <Description>Pandatech.SharedKernel provides centralized configurations, utilities, and extensions for ASP.NET Core projects. For more information refere to readme.md document.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-sharedkernel</RepositoryUrl>
-        <PackageReleaseNotes>Nuget updates</PackageReleaseNotes>
+        <PackageReleaseNotes>Nuget updates and SignalR fix</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>
@@ -51,8 +51,8 @@
         <PackageReference Include="Pandatech.FluentMinimalApiMapper" Version="2.0.1" />
         <PackageReference Include="Pandatech.PandaVaultClient" Version="4.0.3" />
         <PackageReference Include="Pandatech.RegexBox" Version="3.0.0" />
-        <PackageReference Include="Pandatech.ResponseCrafter" Version="5.1.1" />
-        <PackageReference Include="Scalar.AspNetCore" Version="1.2.56" />
+        <PackageReference Include="Pandatech.ResponseCrafter" Version="5.1.2" />
+        <PackageReference Include="Scalar.AspNetCore" Version="1.2.61" />
         <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
         <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.2.0" />
     </ItemGroup>
diff --git a/test/SharedKernel.Tests/SharedKernel.Tests.csproj b/test/SharedKernel.Tests/SharedKernel.Tests.csproj
index 320384e..a510ed9 100644
--- a/test/SharedKernel.Tests/SharedKernel.Tests.csproj
+++ b/test/SharedKernel.Tests/SharedKernel.Tests.csproj
@@ -12,7 +12,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>