diff --git a/TransactionProcessor.Aggregates/TransactionProcessor.Aggregates.csproj b/TransactionProcessor.Aggregates/TransactionProcessor.Aggregates.csproj
index 8fe9e1c7..aa93abe2 100644
--- a/TransactionProcessor.Aggregates/TransactionProcessor.Aggregates.csproj
+++ b/TransactionProcessor.Aggregates/TransactionProcessor.Aggregates.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Shared.EventStore" Version="2025.1.2" />
+		<PackageReference Include="Shared.EventStore" Version="2025.2.1" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj b/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
index f2678183..e4d0d330 100644
--- a/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
+++ b/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
@@ -6,12 +6,12 @@
 
   <ItemGroup>
     <PackageReference Include="CallbackHandler.DataTransferObjects" Version="2024.11.1" />
-    <PackageReference Include="ClientProxyBase" Version="2025.1.2" />
+    <PackageReference Include="ClientProxyBase" Version="2025.2.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
     <PackageReference Include="MessagingService.Client" Version="2025.1.4" />
     <PackageReference Include="SecurityService.Client" Version="2025.1.1" />
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="2025.1.2" />
-    <PackageReference Include="Shared.EventStore" Version="2025.1.2" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="2025.2.1" />
+    <PackageReference Include="Shared.EventStore" Version="2025.2.1" />
     <PackageReference Include="MediatR" Version="12.2.0" />
     <PackageReference Include="System.IO.Abstractions" Version="21.0.2" />
     <PackageReference Include="System.ServiceModel.Duplex" Version="6.0.0" />
diff --git a/TransactionProcessor.Client/TransactionProcessor.Client.csproj b/TransactionProcessor.Client/TransactionProcessor.Client.csproj
index 7c29b116..4f75d56f 100644
--- a/TransactionProcessor.Client/TransactionProcessor.Client.csproj
+++ b/TransactionProcessor.Client/TransactionProcessor.Client.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.1.2" />
-    <PackageReference Include="Shared.Results" Version="2025.1.2" />
+    <PackageReference Include="ClientProxyBase" Version="2025.2.1" />
+    <PackageReference Include="Shared.Results" Version="2025.2.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TransactionProcessor.Database/TransactionProcessor.Database.csproj b/TransactionProcessor.Database/TransactionProcessor.Database.csproj
index d7e4f32e..e14f9d7a 100644
--- a/TransactionProcessor.Database/TransactionProcessor.Database.csproj
+++ b/TransactionProcessor.Database/TransactionProcessor.Database.csproj
@@ -19,9 +19,9 @@
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
 		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
-		<PackageReference Include="Shared" Version="2025.1.1" />
+		<PackageReference Include="Shared" Version="2025.2.1" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.1.1" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.2.1" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/TransactionProcessor.DomainEvents/TransactionProcessor.DomainEvents.csproj b/TransactionProcessor.DomainEvents/TransactionProcessor.DomainEvents.csproj
index 5b772ceb..987bd7ae 100644
--- a/TransactionProcessor.DomainEvents/TransactionProcessor.DomainEvents.csproj
+++ b/TransactionProcessor.DomainEvents/TransactionProcessor.DomainEvents.csproj
@@ -6,6 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.1.2" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.2.1" />
 	</ItemGroup>
 </Project>
diff --git a/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessor.IntegrationTesting.Helpers.csproj b/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessor.IntegrationTesting.Helpers.csproj
index 2b3e300d..c7b2e1a7 100644
--- a/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessor.IntegrationTesting.Helpers.csproj
+++ b/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessor.IntegrationTesting.Helpers.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.1.2" />
+    <PackageReference Include="ClientProxyBase" Version="2025.2.1" />
     <PackageReference Include="Reqnroll" Version="1.0.1" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.1.2" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.2.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj b/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj
index 945617fa..a0727f9b 100644
--- a/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj
+++ b/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.1.2" />
+    <PackageReference Include="ClientProxyBase" Version="2025.2.1" />
     <PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
     <PackageReference Include="EventStoreProjections" Version="2023.12.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="SecurityService.Client" Version="2025.1.1" />
     <PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.1.1" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.1.2" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.2.1" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
     <PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="1.0.1" />
 	  <PackageReference Include="NUnit" Version="4.1.0" />
diff --git a/TransactionProcessor.ProjectionEngine/TransactionProcessor.ProjectionEngine.csproj b/TransactionProcessor.ProjectionEngine/TransactionProcessor.ProjectionEngine.csproj
index c02e0a42..d8272e51 100644
--- a/TransactionProcessor.ProjectionEngine/TransactionProcessor.ProjectionEngine.csproj
+++ b/TransactionProcessor.ProjectionEngine/TransactionProcessor.ProjectionEngine.csproj
@@ -10,8 +10,8 @@
     <PackageReference Include="FileProcessor.File.DomainEvents" Version="2025.1.1" />
     <PackageReference Include="FileProcessor.FileImportLog.DomainEvents" Version="2025.1.1" />
     
-    <PackageReference Include="Shared" Version="2025.1.2" />
-    <PackageReference Include="Shared.EventStore" Version="2025.1.2" />
+    <PackageReference Include="Shared" Version="2025.2.1" />
+    <PackageReference Include="Shared.EventStore" Version="2025.2.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TransactionProcessor.Repository/TransactionProcessor.Repository.csproj b/TransactionProcessor.Repository/TransactionProcessor.Repository.csproj
index 82086da1..d15a5181 100644
--- a/TransactionProcessor.Repository/TransactionProcessor.Repository.csproj
+++ b/TransactionProcessor.Repository/TransactionProcessor.Repository.csproj
@@ -13,8 +13,8 @@
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
-		<PackageReference Include="Shared" Version="2025.1.1" />
-		<PackageReference Include="Shared.EventStore" Version="2025.1.1" />
+		<PackageReference Include="Shared" Version="2025.2.1" />
+		<PackageReference Include="Shared.EventStore" Version="2025.2.1" />
 
 	</ItemGroup>
 
diff --git a/TransactionProcessor.Testing/TransactionProcessor.Testing.csproj b/TransactionProcessor.Testing/TransactionProcessor.Testing.csproj
index a0002030..345d0f59 100644
--- a/TransactionProcessor.Testing/TransactionProcessor.Testing.csproj
+++ b/TransactionProcessor.Testing/TransactionProcessor.Testing.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.1.2" />
+    <PackageReference Include="ClientProxyBase" Version="2025.2.1" />
     <PackageReference Include="SecurityService.Client" Version="2025.1.1" />
   </ItemGroup>
 
diff --git a/TransactionProcessor.Tests/TransactionProcessor.Tests.csproj b/TransactionProcessor.Tests/TransactionProcessor.Tests.csproj
index a14f8f66..d3d7aa56 100644
--- a/TransactionProcessor.Tests/TransactionProcessor.Tests.csproj
+++ b/TransactionProcessor.Tests/TransactionProcessor.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.1.2" />
+    <PackageReference Include="ClientProxyBase" Version="2025.2.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
diff --git a/TransactionProcessor/TransactionProcessor.csproj b/TransactionProcessor/TransactionProcessor.csproj
index 39370b44..14325607 100644
--- a/TransactionProcessor/TransactionProcessor.csproj
+++ b/TransactionProcessor/TransactionProcessor.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="ClientProxyBase" Version="2025.1.2" />
+	  <PackageReference Include="ClientProxyBase" Version="2025.2.1" />
 	  <PackageReference Include="Lamar" Version="13.0.3" />
 	  <PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="13.0.3" />
 	  <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.0" />
@@ -37,8 +37,8 @@
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageReference Include="SecurityService.Client" Version="2025.1.1" />
-    <PackageReference Include="Shared" Version="2025.1.2" />
-    <PackageReference Include="Shared.EventStore" Version="2025.1.2" />
+    <PackageReference Include="Shared" Version="2025.2.1" />
+    <PackageReference Include="Shared.EventStore" Version="2025.2.1" />
       <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
 	  <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
 	  <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
diff --git a/TransactionProcessor/appsettings.json b/TransactionProcessor/appsettings.json
index f3d4b979..93fae6d5 100644
--- a/TransactionProcessor/appsettings.json
+++ b/TransactionProcessor/appsettings.json
@@ -49,9 +49,6 @@
       "SettlementScheduleChangedEvent": [
         "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler, TransactionProcessor.BusinessLogic"
       ],
-      "CallbackReceivedEnrichedEvent": [
-        "TransactionProcessor.BusinessLogic.EventHandling.MerchantDomainEventHandler,TransactionProcessor.BusinessLogic"
-      ],
       "ContractAddedToMerchantEvent": [
         "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler,TransactionProcessor.BusinessLogic"
       ],
@@ -114,29 +111,21 @@
 
       // Transaction Event Handler
       "TransactionHasBeenCompletedEvent": [
-        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler,TransactionProcessor.BusinessLogic",
         "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler,TransactionProcessor.BusinessLogic"
       ],
       "CustomerEmailReceiptRequestedEvent": [
         "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler,TransactionProcessor.BusinessLogic"
       ],
       "SettledMerchantFeeAddedToTransactionEvent": [
-        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler,TransactionProcessor.BusinessLogic",
         "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler, TransactionProcessor.BusinessLogic"
       ],
       "MerchantFeeSettledEvent": [
-        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler,TransactionProcessor.BusinessLogic",
         "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler, TransactionProcessor.BusinessLogic"
-      ],
-      "MerchantFeePendingSettlementAddedToTransactionEvent": [
-        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler,TransactionProcessor.BusinessLogic"
-      ],
+      ],      
       "TransactionCostInformationRecordedEvent": [
-        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler, TransactionProcessor.BusinessLogic",
         "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler,TransactionProcessor.BusinessLogic"
       ],
       "FloatCreditPurchasedEvent": [
-        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler, TransactionProcessor.BusinessLogic",
         "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler, TransactionProcessor.BusinessLogic"
       ],
       "FloatCreatedForContractProductEvent": [
@@ -187,17 +176,6 @@
       "ReconciliationHasCompletedEvent": [
         "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler,TransactionProcessor.BusinessLogic"
       ],
-      //"VoucherGeneratedEvent": [
-      //  "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler,TransactionProcessor.BusinessLogic"
-      //],
-      "VoucherIssuedEvent": [
-      //  "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler,TransactionProcessor.BusinessLogic",
-        "TransactionProcessor.BusinessLogic.EventHandling.VoucherDomainEventHandler, TransactionProcessor.BusinessLogic",
-      ],
-      //"VoucherFullyRedeemedEvent": [
-      //  "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler,TransactionProcessor.BusinessLogic",
-      //  "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler,TransactionProcessor.BusinessLogic"
-      //],
       // Operator Domain Event Handler
       "OperatorCreatedEvent": [
         "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler, TransactionProcessor.BusinessLogic"
@@ -223,8 +201,7 @@
         "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler, TransactionProcessor.BusinessLogic"
       ],
       "StatementGeneratedEvent": [
-        "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler, TransactionProcessor.BusinessLogic",
-        "TransactionProcessor.BusinessLogic.EventHandling.MerchantDomainEventHandler, TransactionProcessor.BusinessLogic"
+        "TransactionProcessor.BusinessLogic.EventHandling.ReadModelDomainEventHandler, TransactionProcessor.BusinessLogic"//,
       ],
       // Settlement Domain Event Handler
       "SettlementCreatedForDateEvent": [
@@ -267,6 +244,9 @@
       ]
     },
     "EventHandlerConfigurationOrdered": {
+      "CallbackReceivedEnrichedEvent": [
+        "TransactionProcessor.BusinessLogic.EventHandling.MerchantDomainEventHandler,TransactionProcessor.BusinessLogic"
+      ],
       "EstateCreatedEvent": [
         "TransactionProcessor.ProjectionEngine.EventHandling.EventHandler,TransactionProcessor.ProjectionEngine"
       ],
@@ -287,13 +267,15 @@
       ],
       "TransactionHasBeenCompletedEvent": [
         "TransactionProcessor.ProjectionEngine.EventHandling.EventHandler,TransactionProcessor.ProjectionEngine",
-        "TransactionProcessor.BusinessLogic.EventHandling.MerchantStatementDomainEventHandler,TransactionProcessor.BusinessLogic"
+        "TransactionProcessor.BusinessLogic.EventHandling.MerchantStatementDomainEventHandler,TransactionProcessor.BusinessLogic",
+        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler,TransactionProcessor.BusinessLogic"
       ],
       "CustomerEmailReceiptRequestedEvent": [
         "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler,TransactionProcessor.BusinessLogic"
       ],
       "SettledMerchantFeeAddedToTransactionEvent": [
-        "TransactionProcessor.ProjectionEngine.EventHandling.EventHandler,TransactionProcessor.ProjectionEngine"
+        "TransactionProcessor.ProjectionEngine.EventHandling.EventHandler,TransactionProcessor.ProjectionEngine",
+        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler,TransactionProcessor.BusinessLogic"
       ],
       "VoucherGeneratedEvent": [
         "TransactionProcessor.ProjectionEngine.EventHandling.EventHandler,TransactionProcessor.ProjectionEngine"
@@ -308,10 +290,21 @@
         "TransactionProcessor.ProjectionEngine.EventHandling.EventHandler,TransactionProcessor.ProjectionEngine"
       ],
       "MerchantFeeSettledEvent": [
-        "TransactionProcessor.BusinessLogic.EventHandling.MerchantSettlementDomainEventHandler,TransactionProcessor.BusinessLogic"
+        "TransactionProcessor.BusinessLogic.EventHandling.MerchantSettlementDomainEventHandler,TransactionProcessor.BusinessLogic",
+        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler,TransactionProcessor.BusinessLogic",
       ],
       "StatementGeneratedEvent": [
-        "TransactionProcessor.BusinessLogic.EventHandling.MerchantStatementDomainEventHandler,TransactionProcessor.BusinessLogic"
+        "TransactionProcessor.BusinessLogic.EventHandling.MerchantStatementDomainEventHandler,TransactionProcessor.BusinessLogic",
+        "TransactionProcessor.BusinessLogic.EventHandling.MerchantDomainEventHandler, TransactionProcessor.BusinessLogic"
+      ],
+      "TransactionCostInformationRecordedEvent": [
+        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler, TransactionProcessor.BusinessLogic"
+      ],
+      "FloatCreditPurchasedEvent": [
+        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler, TransactionProcessor.BusinessLogic"
+      ],
+      "MerchantFeePendingSettlementAddedToTransactionEvent": [
+        "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler,TransactionProcessor.BusinessLogic"
       ]
     },
     "EventStateConfig": {
@@ -338,7 +331,7 @@
           "IncludeGroups": "Transaction Processor",
           "IgnoreGroups": "Ordered,local-",
           "Enabled": true,
-          "InflightMessages": 500,
+          "InflightMessages": 20,
           "IsOrdered": false,
           "InstanceCount": 1
         },
diff --git a/TransactionProcessor/nlog.config b/TransactionProcessor/nlog.config
index 174dab33..df512318 100644
--- a/TransactionProcessor/nlog.config
+++ b/TransactionProcessor/nlog.config
@@ -30,10 +30,10 @@
 	Error - Error messages
 	Fatal - Fatal error messages. After a fatal error, the application usually terminates
 	-->
-
+s
 	<rules>
 		<logger name="Microsoft.*" minlevel="Warn" writeTo="" final="true" />
-		<logger name="*" minlevel="Trace" writeTo="logfile">
+		<logger name="*" minlevel="Warn" writeTo="logfile">
 			<filters defaultAction="Log">
 				<when condition="contains('${message}', 'HEALTH_CHECK')" action="Ignore"></when>
 			</filters>