diff --git a/samples/KafkaFlow.Retry.Sample/Handlers/RetryDurableTestHandler.cs b/samples/KafkaFlow.Retry.Sample/Handlers/RetryDurableTestHandler.cs
index 39b66d5f..c88242f3 100644
--- a/samples/KafkaFlow.Retry.Sample/Handlers/RetryDurableTestHandler.cs
+++ b/samples/KafkaFlow.Retry.Sample/Handlers/RetryDurableTestHandler.cs
@@ -5,8 +5,7 @@
     using KafkaFlow;
     using KafkaFlow.Retry.Sample.Exceptions;
     using KafkaFlow.Retry.Sample.Messages;
-    using KafkaFlow.TypedHandler;
-
+    
     internal class RetryDurableTestHandler : IMessageHandler<RetryDurableTestMessage>
     {
         public Task Handle(IMessageContext context, RetryDurableTestMessage message)
diff --git a/samples/KafkaFlow.Retry.Sample/Handlers/RetryForeverTestHandler.cs b/samples/KafkaFlow.Retry.Sample/Handlers/RetryForeverTestHandler.cs
index 15dbb10b..93d6e6ec 100644
--- a/samples/KafkaFlow.Retry.Sample/Handlers/RetryForeverTestHandler.cs
+++ b/samples/KafkaFlow.Retry.Sample/Handlers/RetryForeverTestHandler.cs
@@ -5,7 +5,7 @@
     using KafkaFlow;
     using KafkaFlow.Retry.Sample.Exceptions;
     using KafkaFlow.Retry.Sample.Messages;
-    using KafkaFlow.TypedHandler;
+    
 
     internal class RetryForeverTestHandler : IMessageHandler<RetryForeverTestMessage>
     {
diff --git a/samples/KafkaFlow.Retry.Sample/Handlers/RetrySimpleTestHandler.cs b/samples/KafkaFlow.Retry.Sample/Handlers/RetrySimpleTestHandler.cs
index 0e07db81..f17c5bff 100644
--- a/samples/KafkaFlow.Retry.Sample/Handlers/RetrySimpleTestHandler.cs
+++ b/samples/KafkaFlow.Retry.Sample/Handlers/RetrySimpleTestHandler.cs
@@ -5,7 +5,7 @@
     using KafkaFlow;
     using KafkaFlow.Retry.Sample.Exceptions;
     using KafkaFlow.Retry.Sample.Messages;
-    using KafkaFlow.TypedHandler;
+    
 
     internal class RetrySimpleTestHandler : IMessageHandler<RetrySimpleTestMessage>
     {
diff --git a/samples/KafkaFlow.Retry.Sample/Helpers/KafkaClusterConfigurationBuilderHelper.cs b/samples/KafkaFlow.Retry.Sample/Helpers/KafkaClusterConfigurationBuilderHelper.cs
index 568f5d5d..2a45fdab 100644
--- a/samples/KafkaFlow.Retry.Sample/Helpers/KafkaClusterConfigurationBuilderHelper.cs
+++ b/samples/KafkaFlow.Retry.Sample/Helpers/KafkaClusterConfigurationBuilderHelper.cs
@@ -8,8 +8,6 @@
     using KafkaFlow.Retry.Sample.Messages;
     using KafkaFlow.Retry.SqlServer;
     using KafkaFlow.Serializer;
-    using KafkaFlow.TypedHandler;
-
     internal static class KafkaClusterConfigurationBuilderHelper
     {
         internal static IClusterConfigurationBuilder SetupRetryDurableMongoDb(
@@ -41,7 +39,7 @@ internal static IClusterConfigurationBuilder SetupRetryDurableMongoDb(
                         .WithAutoOffsetReset(AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSerializer<ProtobufNetSerializer>()
+                                .AddDeserializer<ProtobufNetDeserializer>()
                                 .RetryDurable(
                                     configure => configure
                                         .Handle<RetryDurableTestException>()
@@ -129,7 +127,7 @@ internal static IClusterConfigurationBuilder SetupRetryDurableSqlServer(
                         .WithAutoOffsetReset(AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSerializer<ProtobufNetSerializer>()
+                                .AddDeserializer<ProtobufNetDeserializer>()
                                 .RetryDurable(
                                     configure => configure
                                         .Handle<RetryDurableTestException>()
@@ -209,7 +207,7 @@ internal static IClusterConfigurationBuilder SetupRetryForever(this IClusterConf
                         .WithAutoOffsetReset(AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSerializer<ProtobufNetSerializer>()
+                                .AddDeserializer<ProtobufNetDeserializer>()
                                 .RetryForever(
                                     (configure) => configure
                                         .Handle<RetryForeverTestException>()
@@ -251,7 +249,7 @@ internal static IClusterConfigurationBuilder SetupRetrySimple(this IClusterConfi
                         .WithAutoOffsetReset(AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSerializer<ProtobufNetSerializer>()
+                                .AddDeserializer<ProtobufNetDeserializer>()
                                 .RetrySimple(
                                     (configure) => configure
                                         .Handle<RetrySimpleTestException>()
diff --git a/samples/KafkaFlow.Retry.Sample/KafkaFlow.Retry.Sample.csproj b/samples/KafkaFlow.Retry.Sample/KafkaFlow.Retry.Sample.csproj
index 3b98b065..04fe992e 100644
--- a/samples/KafkaFlow.Retry.Sample/KafkaFlow.Retry.Sample.csproj
+++ b/samples/KafkaFlow.Retry.Sample/KafkaFlow.Retry.Sample.csproj
@@ -8,15 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KafkaFlow" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Admin" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Compressor" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.LogHandler.Console" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Serializer" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Serializer.ProtobufNet" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.TypedHandler" Version="2.2.15" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
+    <PackageReference Include="KafkaFlow" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Admin" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.LogHandler.Console" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Serializer.ProtobufNet" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/KafkaFlow.Retry.SchemaRegistry.Sample/Handlers/AvroMessageTestHandler.cs b/samples/KafkaFlow.Retry.SchemaRegistry.Sample/Handlers/AvroMessageTestHandler.cs
index 0ae7295e..076b1443 100644
--- a/samples/KafkaFlow.Retry.SchemaRegistry.Sample/Handlers/AvroMessageTestHandler.cs
+++ b/samples/KafkaFlow.Retry.SchemaRegistry.Sample/Handlers/AvroMessageTestHandler.cs
@@ -4,7 +4,6 @@
     using System.Threading.Tasks;
     using global::SchemaRegistry;
     using KafkaFlow.Retry.SchemaRegistry.Sample.Exceptions;
-    using TypedHandler;
 
     public class AvroMessageTestHandler : IMessageHandler<AvroLogMessage>
     {
diff --git a/samples/KafkaFlow.Retry.SchemaRegistry.Sample/Helpers/KafkaClusterConfigurationBuilderHelper.cs b/samples/KafkaFlow.Retry.SchemaRegistry.Sample/Helpers/KafkaClusterConfigurationBuilderHelper.cs
index 06ebd2a0..5a7d43c6 100644
--- a/samples/KafkaFlow.Retry.SchemaRegistry.Sample/Helpers/KafkaClusterConfigurationBuilderHelper.cs
+++ b/samples/KafkaFlow.Retry.SchemaRegistry.Sample/Helpers/KafkaClusterConfigurationBuilderHelper.cs
@@ -9,7 +9,6 @@
     using KafkaFlow.Retry.SchemaRegistry.Sample.ContractResolvers;
     using KafkaFlow.Retry.SchemaRegistry.Sample.Exceptions;
     using KafkaFlow.Retry.SchemaRegistry.Sample.Handlers;
-    using KafkaFlow.TypedHandler;
     using Newtonsoft.Json;
 
     internal static class KafkaClusterConfigurationBuilderHelper
@@ -47,7 +46,7 @@ internal static IClusterConfigurationBuilder SetupRetryDurableMongoAvroDb(
                         .WithAutoOffsetReset(AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSchemaRegistryAvroSerializer()
+                                .AddSchemaRegistryAvroDeserializer()
                                 .RetryDurable(
                                     configure => configure
                                         .Handle<RetryDurableTestException>()
diff --git a/samples/KafkaFlow.Retry.SchemaRegistry.Sample/KafkaFlow.Retry.SchemaRegistry.Sample.csproj b/samples/KafkaFlow.Retry.SchemaRegistry.Sample/KafkaFlow.Retry.SchemaRegistry.Sample.csproj
index 11bc0e92..cfabe469 100644
--- a/samples/KafkaFlow.Retry.SchemaRegistry.Sample/KafkaFlow.Retry.SchemaRegistry.Sample.csproj
+++ b/samples/KafkaFlow.Retry.SchemaRegistry.Sample/KafkaFlow.Retry.SchemaRegistry.Sample.csproj
@@ -8,16 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KafkaFlow" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Admin" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Compressor" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.LogHandler.Console" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Serializer" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Serializer.ProtobufNet" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.TypedHandler" Version="2.2.15" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
+    <PackageReference Include="KafkaFlow" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Admin" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.LogHandler.Console" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Serializer.ProtobufNet" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/KafkaFlow.Retry.API/KafkaFlow.Retry.API.csproj b/src/KafkaFlow.Retry.API/KafkaFlow.Retry.API.csproj
index 9b7914d0..fc871ffc 100644
--- a/src/KafkaFlow.Retry.API/KafkaFlow.Retry.API.csproj
+++ b/src/KafkaFlow.Retry.API/KafkaFlow.Retry.API.csproj
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/KafkaFlow.Retry.IntegrationTests/Core/Bootstrappers/BootstrapperKafka.cs b/src/KafkaFlow.Retry.IntegrationTests/Core/Bootstrappers/BootstrapperKafka.cs
index ddc1e636..1c2f7551 100644
--- a/src/KafkaFlow.Retry.IntegrationTests/Core/Bootstrappers/BootstrapperKafka.cs
+++ b/src/KafkaFlow.Retry.IntegrationTests/Core/Bootstrappers/BootstrapperKafka.cs
@@ -11,7 +11,6 @@
     using KafkaFlow.Retry.Postgres;
     using KafkaFlow.Retry.SqlServer;
     using KafkaFlow.Serializer;
-    using KafkaFlow.TypedHandler;
     using Newtonsoft.Json;
 
     internal static class BootstrapperKafka
@@ -71,7 +70,7 @@ internal static IClusterConfigurationBuilder SetupRetryDurableGuaranteeOrderedCo
                         .WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
+                                .AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
                                 .RetryDurable(
                                     (configure) => configure
                                         .Handle<RetryDurableTestException>()
@@ -147,7 +146,7 @@ internal static IClusterConfigurationBuilder SetupRetryDurableGuaranteeOrderedCo
                         .WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
+                                .AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
                                 .RetryDurable(
                                     (configure) => configure
                                         .Handle<RetryDurableTestException>()
@@ -221,7 +220,7 @@ internal static IClusterConfigurationBuilder SetupRetryDurableGuaranteeOrderedCo
                         .WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
+                                .AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
                                 .RetryDurable(
                                     (configure) => configure
                                         .Handle<RetryDurableTestException>()
@@ -297,7 +296,7 @@ internal static IClusterConfigurationBuilder SetupRetryDurableLatestConsumptionM
                         .WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
+                                .AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
                                 .RetryDurable(
                                     (configure) => configure
                                         .Handle<RetryDurableTestException>()
@@ -373,7 +372,7 @@ internal static IClusterConfigurationBuilder SetupRetryDurableLatestConsumptionS
                         .WithAutoOffsetReset((KafkaFlow.AutoOffsetReset)AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
+                                .AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
                                 .RetryDurable(
                                     (configure) => configure
                                         .Handle<RetryDurableTestException>()
@@ -448,7 +447,7 @@ internal static IClusterConfigurationBuilder SetupRetryDurableLatestConsumptionP
                         .WithAutoOffsetReset((KafkaFlow.AutoOffsetReset)AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
+                                .AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
                                 .RetryDurable(
                                     (configure) => configure
                                         .Handle<RetryDurableTestException>()
@@ -519,7 +518,7 @@ internal static IClusterConfigurationBuilder SetupRetryForeverCluster(this IClus
                         .WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSingleTypeSerializer<ProtobufNetSerializer>(typeof(RetryForeverTestMessage))
+                                .AddSingleTypeDeserializer<ProtobufNetDeserializer>(typeof(RetryForeverTestMessage))
                                 .RetryForever(
                                     (configure) => configure
                                         .Handle<RetryForeverTestException>()
@@ -551,7 +550,7 @@ internal static IClusterConfigurationBuilder SetupRetrySimpleCluster(this IClust
                         .WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetrySimpleTestMessage))
+                                .AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetrySimpleTestMessage))
                                 .RetrySimple(
                                     (configure) => configure
                                         .Handle<RetrySimpleTestException>()
diff --git a/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetryDurableTestMessageHandler.cs b/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetryDurableTestMessageHandler.cs
index 6cf184a4..f405f56a 100644
--- a/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetryDurableTestMessageHandler.cs
+++ b/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetryDurableTestMessageHandler.cs
@@ -5,7 +5,6 @@
     using KafkaFlow.Retry.IntegrationTests.Core.Exceptions;
     using KafkaFlow.Retry.IntegrationTests.Core.Messages;
     using KafkaFlow.Retry.IntegrationTests.Core.Storages;
-    using KafkaFlow.TypedHandler;
 
     internal class RetryDurableTestMessageHandler : IMessageHandler<RetryDurableTestMessage>
     {
diff --git a/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetryForeverTestMessageHandler.cs b/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetryForeverTestMessageHandler.cs
index dbf6f9f9..a5decaf3 100644
--- a/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetryForeverTestMessageHandler.cs
+++ b/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetryForeverTestMessageHandler.cs
@@ -5,7 +5,6 @@
     using KafkaFlow.Retry.IntegrationTests.Core.Exceptions;
     using KafkaFlow.Retry.IntegrationTests.Core.Messages;
     using KafkaFlow.Retry.IntegrationTests.Core.Storages;
-    using KafkaFlow.TypedHandler;
 
     internal class RetryForeverTestMessageHandler : IMessageHandler<RetryForeverTestMessage>
     {
diff --git a/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetrySimpleTestMessageHandler.cs b/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetrySimpleTestMessageHandler.cs
index 9a97b0fe..ae7eefab 100644
--- a/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetrySimpleTestMessageHandler.cs
+++ b/src/KafkaFlow.Retry.IntegrationTests/Core/Handlers/RetrySimpleTestMessageHandler.cs
@@ -5,7 +5,6 @@
     using KafkaFlow.Retry.IntegrationTests.Core.Exceptions;
     using KafkaFlow.Retry.IntegrationTests.Core.Messages;
     using KafkaFlow.Retry.IntegrationTests.Core.Storages;
-    using KafkaFlow.TypedHandler;
 
     internal class RetrySimpleTestMessageHandler : IMessageHandler<RetrySimpleTestMessage>
     {
diff --git a/src/KafkaFlow.Retry.IntegrationTests/KafkaFlow.Retry.IntegrationTests.csproj b/src/KafkaFlow.Retry.IntegrationTests/KafkaFlow.Retry.IntegrationTests.csproj
index 62db33e5..02dec845 100644
--- a/src/KafkaFlow.Retry.IntegrationTests/KafkaFlow.Retry.IntegrationTests.csproj
+++ b/src/KafkaFlow.Retry.IntegrationTests/KafkaFlow.Retry.IntegrationTests.csproj
@@ -8,31 +8,28 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.17.0" />
-    <PackageReference Include="FluentAssertions" Version="6.9.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.5" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="AutoFixture" Version="4.18.1" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="OpenCover" Version="4.7.1221" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="KafkaFlow" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Admin" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Compressor" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.LogHandler.Console" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Serializer" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Serializer.NewtonsoftJson" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.TypedHandler" Version="2.2.15" />
+    <PackageReference Include="KafkaFlow" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Admin" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.LogHandler.Console" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Serializer.NewtonsoftJson" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/KafkaFlow.Retry.MongoDb/KafkaFlow.Retry.MongoDb.csproj b/src/KafkaFlow.Retry.MongoDb/KafkaFlow.Retry.MongoDb.csproj
index ae6f3dd4..684288b5 100644
--- a/src/KafkaFlow.Retry.MongoDb/KafkaFlow.Retry.MongoDb.csproj
+++ b/src/KafkaFlow.Retry.MongoDb/KafkaFlow.Retry.MongoDb.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.12.4" />
+    <PackageReference Include="MongoDB.Driver" Version="2.22.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/KafkaFlow.Retry.SqlServer/KafkaFlow.Retry.SqlServer.csproj b/src/KafkaFlow.Retry.SqlServer/KafkaFlow.Retry.SqlServer.csproj
index 959ff407..da649186 100644
--- a/src/KafkaFlow.Retry.SqlServer/KafkaFlow.Retry.SqlServer.csproj
+++ b/src/KafkaFlow.Retry.SqlServer/KafkaFlow.Retry.SqlServer.csproj
@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/KafkaFlow.Retry.UnitTests/KafkaFlow.Retry.UnitTests.csproj b/src/KafkaFlow.Retry.UnitTests/KafkaFlow.Retry.UnitTests.csproj
index 78bad49a..56040155 100644
--- a/src/KafkaFlow.Retry.UnitTests/KafkaFlow.Retry.UnitTests.csproj
+++ b/src/KafkaFlow.Retry.UnitTests/KafkaFlow.Retry.UnitTests.csproj
@@ -16,21 +16,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.9.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="OpenCover" Version="4.7.1221" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.52.0.60960">
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.14.0.81108">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/KafkaFlow.Retry/Durable/Definitions/Builders/RetryDurableEmbeddedClusterDefinitionBuilder.cs b/src/KafkaFlow.Retry/Durable/Definitions/Builders/RetryDurableEmbeddedClusterDefinitionBuilder.cs
index bdc81a59..ae4a88d6 100644
--- a/src/KafkaFlow.Retry/Durable/Definitions/Builders/RetryDurableEmbeddedClusterDefinitionBuilder.cs
+++ b/src/KafkaFlow.Retry/Durable/Definitions/Builders/RetryDurableEmbeddedClusterDefinitionBuilder.cs
@@ -13,8 +13,7 @@
     using KafkaFlow.Retry.Durable.Repository;
     using KafkaFlow.Retry.Durable.Repository.Adapters;
     using KafkaFlow.Retry.Durable.Serializers;
-    using KafkaFlow.TypedHandler;
-
+    
     public class RetryDurableEmbeddedClusterDefinitionBuilder
     {
         private const int DefaultPartitionElection = 0;
diff --git a/src/KafkaFlow.Retry/KafkaFlow.Retry.csproj b/src/KafkaFlow.Retry/KafkaFlow.Retry.csproj
index 191ec2b3..17eba2fa 100644
--- a/src/KafkaFlow.Retry/KafkaFlow.Retry.csproj
+++ b/src/KafkaFlow.Retry/KafkaFlow.Retry.csproj
@@ -27,13 +27,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="KafkaFlow" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Abstractions" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Serializer" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.Serializer.NewtonsoftJson" Version="2.2.15" />
-    <PackageReference Include="KafkaFlow.TypedHandler" Version="2.2.15" />
-    <PackageReference Include="Polly" Version="7.2.2" />
-    <PackageReference Include="Quartz" Version="3.5.0" />
+    <PackageReference Include="KafkaFlow" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Abstractions" Version="3.0.0" />
+    <PackageReference Include="KafkaFlow.Serializer.NewtonsoftJson" Version="3.0.0" />
+    <PackageReference Include="Polly" Version="8.2.0" />
+    <PackageReference Include="Quartz" Version="3.8.0" />
     <PackageReference Include="Dawn.Guard" Version="1.12.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file