diff --git a/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java b/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java
index a02686aa..6023bf76 100644
--- a/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java
+++ b/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java
@@ -38,7 +38,8 @@ public class RabbitMQListener {
   public CompletableFuture<InitiateContractResponse> receive(InitiateContractRequest in)
       throws Exception {
     InitiateContractResponse response =
-        ((InitiateContractCommand) commandMap.getCommand("InitiateContract")).Run(in);
+        (InitiateContractResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("InitiateContract")).Run(in);
     return CompletableFuture.completedFuture(response);
   }
 
@@ -47,8 +48,9 @@ public CompletableFuture<InitiateContractResponse> receive(InitiateContractReque
   public CompletableFuture<ContractTerminationResponse> receive(ContractTerminationRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((RequestContractTerminationCommand) commandMap.getCommand("RequestContractTermination"))
-            .Run(in));
+        (RequestContractTerminationResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("RequestContractTermination"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -56,8 +58,9 @@ public CompletableFuture<ContractTerminationResponse> receive(ContractTerminatio
   public CompletableFuture<HandleTerminationResponse> receive(HandleTerminationRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((HandleTerminationRequestCommand) commandMap.getCommand("HandleTerminationRequest"))
-            .Run(in));
+        (HandleTerminationRequestResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("HandleTerminationRequest"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -65,7 +68,8 @@ public CompletableFuture<HandleTerminationResponse> receive(HandleTerminationReq
   public CompletableFuture<MarkPaymentCompletedResponse> receive(MarkPaymentCompletedRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((MarkMilestoneAsPaidCommand) commandMap.getCommand("MarkMilestoneAsPaid")).Run(in));
+        (MarkMilestoneAsPaidResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("MarkMilestoneAsPaid")).Run(in));
   }
 
   @RabbitHandler
@@ -73,14 +77,16 @@ public CompletableFuture<MarkPaymentCompletedResponse> receive(MarkPaymentComple
   public CompletableFuture<ViewContractMilestonesResponse> receive(ViewContractMilestonesRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((ViewContractMilestonesCommand) commandMap.getCommand("ViewContractMilestones")).Run(in));
+        (ViewContractMilestonesResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("ViewContractMilestones")).Run(in));
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetContractResponse> receive(GetContractRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetContractCommand) commandMap.getCommand("GetContract")).Run(in));
+        (GetContractResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetContract")).Run(in));
   }
 
   @RabbitHandler
@@ -88,7 +94,8 @@ public CompletableFuture<GetContractResponse> receive(GetContractRequest in) thr
   public CompletableFuture<EvaluateMilestoneResponse> receive(EvaluateMilestoneRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((EvaluateMilestoneCommand) commandMap.getCommand("EvaluateMilestone")).Run(in));
+        (EvaluateMilestoneResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("EvaluateMilestone")).Run(in));
   }
 
   @RabbitHandler
@@ -96,7 +103,8 @@ public CompletableFuture<EvaluateMilestoneResponse> receive(EvaluateMilestoneReq
   public CompletableFuture<ProgressMilestoneResponse> receive(ProgressMilestoneRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((ProgressMilestoneCommand) commandMap.getCommand("ProgressMilestone")).Run(in));
+        (ProgressMilestoneResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("ProgressMilestone")).Run(in));
   }
 
   @RabbitHandler
@@ -104,7 +112,8 @@ public CompletableFuture<ProgressMilestoneResponse> receive(ProgressMilestoneReq
   public CompletableFuture<GetPendingTerminationsResponse> receive(GetPendingTerminationsRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetPendingTerminationsCommand) commandMap.getCommand("GetPendingTerminations")).Run(in));
+        (GetPendingTerminationsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetPendingTerminations")).Run(in));
   }
   // NEW_COMMAND_BOILERPLATE
 
diff --git a/services/jobs/src/main/java/com/workup/jobs/RabbitMQListener.java b/services/jobs/src/main/java/com/workup/jobs/RabbitMQListener.java
index 76e5a1b7..21d38611 100644
--- a/services/jobs/src/main/java/com/workup/jobs/RabbitMQListener.java
+++ b/services/jobs/src/main/java/com/workup/jobs/RabbitMQListener.java
@@ -1,13 +1,6 @@
 package com.workup.jobs;
 
-import com.workup.jobs.commands.AcceptProposalCommand;
-import com.workup.jobs.commands.CreateProposalCommand;
-import com.workup.jobs.commands.GetJobByIdCommand;
-import com.workup.jobs.commands.GetMyJobsCommand;
-import com.workup.jobs.commands.GetMyProposalsCommand;
-import com.workup.jobs.commands.GetProposalsByJobIdCommand;
 import com.workup.jobs.commands.JobCommandMap;
-import com.workup.jobs.commands.SearchJobsCommand;
 import com.workup.shared.commands.Command;
 import com.workup.shared.commands.CommandRequest;
 import com.workup.shared.commands.jobs.proposals.requests.AcceptProposalRequest;
@@ -54,7 +47,8 @@ public CompletableFuture<CreateJobResponse> receive(CreateJobRequest in) throws
   public CompletableFuture<CreateProposalResponse> receive(CreateProposalRequest in)
       throws Exception {
     CreateProposalResponse response =
-        ((CreateProposalCommand) commandMap.getCommand("CreateProposal")).Run(in);
+        (CreateProposalResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("CreateProposal")).Run(in);
     return CompletableFuture.completedFuture(response);
   }
 
@@ -62,7 +56,8 @@ public CompletableFuture<CreateProposalResponse> receive(CreateProposalRequest i
   @Async
   public CompletableFuture<GetJobByIdResponse> receive(GetJobByIdRequest request) throws Exception {
     GetJobByIdResponse response =
-        ((GetJobByIdCommand) commandMap.getCommand("GetJobById")).Run(request);
+        (GetJobByIdResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetJobById")).Run(request);
     return CompletableFuture.completedFuture(response);
   }
 
@@ -70,7 +65,8 @@ public CompletableFuture<GetJobByIdResponse> receive(GetJobByIdRequest request)
   @Async
   public CompletableFuture<SearchJobsResponse> receive(SearchJobsRequest request) throws Exception {
     SearchJobsResponse response =
-        ((SearchJobsCommand) commandMap.getCommand("SearchJobs")).Run(request);
+        (SearchJobsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("SearchJobs")).Run(request);
     return CompletableFuture.completedFuture(response);
   }
 
@@ -78,7 +74,8 @@ public CompletableFuture<SearchJobsResponse> receive(SearchJobsRequest request)
   @Async
   public CompletableFuture<GetMyJobsResponse> receive(GetMyJobsRequest request) throws Exception {
     GetMyJobsResponse response =
-        ((GetMyJobsCommand) commandMap.getCommand("GetMyJobs")).Run(request);
+        (GetMyJobsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetMyJobs")).Run(request);
     return CompletableFuture.completedFuture(response);
   }
 
@@ -87,7 +84,8 @@ public CompletableFuture<GetMyJobsResponse> receive(GetMyJobsRequest request) th
   public CompletableFuture<AcceptProposalResponse> receive(AcceptProposalRequest request)
       throws Exception {
     AcceptProposalResponse response =
-        ((AcceptProposalCommand) commandMap.getCommand("AcceptProposal")).Run(request);
+        (AcceptProposalResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("AcceptProposal")).Run(request);
     return CompletableFuture.completedFuture(response);
   }
 
@@ -96,7 +94,9 @@ public CompletableFuture<AcceptProposalResponse> receive(AcceptProposalRequest r
   public CompletableFuture<GetProposalsByJobIdResponse> receive(GetProposalsByJobIdRequest request)
       throws Exception {
     GetProposalsByJobIdResponse response =
-        ((GetProposalsByJobIdCommand) commandMap.getCommand("GetProposalsByJobId")).Run(request);
+        (GetProposalsByJobIdResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetProposalsByJobId"))
+                .Run(request);
     return CompletableFuture.completedFuture(response);
   }
 
@@ -105,7 +105,8 @@ public CompletableFuture<GetProposalsByJobIdResponse> receive(GetProposalsByJobI
   public CompletableFuture<GetMyProposalsResponse> receive(GetMyProposalsRequest request)
       throws Exception {
     GetMyProposalsResponse response =
-        ((GetMyProposalsCommand) commandMap.getCommand("GetMyProposals")).Run(request);
+        (GetMyProposalsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetMyProposals")).Run(request);
     return CompletableFuture.completedFuture(response);
   }
 }
diff --git a/services/payments/src/main/java/com/workup/payments/PaymentsApplication.java b/services/payments/src/main/java/com/workup/payments/PaymentsApplication.java
index 819e50fc..dfd16f9b 100644
--- a/services/payments/src/main/java/com/workup/payments/PaymentsApplication.java
+++ b/services/payments/src/main/java/com/workup/payments/PaymentsApplication.java
@@ -3,7 +3,6 @@
 import com.workup.shared.enums.ControllerQueueNames;
 import com.workup.shared.enums.ServiceQueueNames;
 import com.workup.shared.enums.ThreadPoolSize;
-
 import org.springframework.amqp.core.AnonymousQueue;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.BindingBuilder;
diff --git a/services/payments/src/main/java/com/workup/payments/RabbitMQListener.java b/services/payments/src/main/java/com/workup/payments/RabbitMQListener.java
index 471a93ba..d2883070 100644
--- a/services/payments/src/main/java/com/workup/payments/RabbitMQListener.java
+++ b/services/payments/src/main/java/com/workup/payments/RabbitMQListener.java
@@ -2,14 +2,6 @@
 
 import com.workup.payments.commands.PaymentCommandMap;
 import com.workup.payments.commands.paymentrequest.*;
-import com.workup.payments.commands.paymenttransaction.GetClientPaymentTransactionsCommand;
-import com.workup.payments.commands.paymenttransaction.GetFreelancerPaymentTransactionsCommand;
-import com.workup.payments.commands.wallet.CreateWalletCommand;
-import com.workup.payments.commands.wallet.GetWalletCommand;
-import com.workup.payments.commands.wallettransaction.CreateWalletTransactionCommand;
-import com.workup.payments.commands.wallettransaction.GetWalletTransactionCommand;
-import com.workup.payments.commands.wallettransaction.GetWalletTransactionsCommand;
-import com.workup.payments.commands.wallettransaction.WithdrawFromWalletCommand;
 import com.workup.shared.commands.payments.paymentrequest.requests.*;
 import com.workup.shared.commands.payments.paymentrequest.responses.*;
 import com.workup.shared.commands.payments.paymenttransaction.requests.GetClientPaymentTransactionsRequest;
@@ -47,7 +39,8 @@ public class RabbitMQListener {
   public CompletableFuture<CreatePaymentRequestResponse> receive(CreatePaymentRequestRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((CreatePaymentRequestCommand) commandMap.getCommand("CreatePaymentRequest")).Run(in));
+        (CreatePaymentRequestResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("CreatePaymentRequest")).Run(in));
   }
 
   @RabbitHandler
@@ -55,8 +48,9 @@ public CompletableFuture<CreatePaymentRequestResponse> receive(CreatePaymentRequ
   public CompletableFuture<CreateWalletTransactionResponse> receive(
       CreateWalletTransactionRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((CreateWalletTransactionCommand) commandMap.getCommand("CreateWalletTransaction"))
-            .Run(in));
+        (CreateWalletTransactionResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("CreateWalletTransaction"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -64,8 +58,9 @@ public CompletableFuture<CreateWalletTransactionResponse> receive(
   public CompletableFuture<GetClientPaymentRequestsResponse> receive(
       GetClientPaymentRequestsRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetClientPaymentRequestsCommand) commandMap.getCommand("GetClientPaymentRequests"))
-            .Run(in));
+        (GetClientPaymentRequestsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetClientPaymentRequests"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -73,7 +68,8 @@ public CompletableFuture<GetClientPaymentRequestsResponse> receive(
   public CompletableFuture<GetWalletTransactionResponse> receive(GetWalletTransactionRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetWalletTransactionCommand) commandMap.getCommand("GetWalletTransaction")).Run(in));
+        (GetWalletTransactionResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetWalletTransaction")).Run(in));
   }
 
   @RabbitHandler
@@ -81,7 +77,8 @@ public CompletableFuture<GetWalletTransactionResponse> receive(GetWalletTransact
   public CompletableFuture<GetWalletTransactionsResponse> receive(GetWalletTransactionsRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetWalletTransactionsCommand) commandMap.getCommand("GetWalletTransactions")).Run(in));
+        (GetWalletTransactionsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetWalletTransactions")).Run(in));
   }
 
   @RabbitHandler
@@ -89,7 +86,8 @@ public CompletableFuture<GetWalletTransactionsResponse> receive(GetWalletTransac
   public CompletableFuture<WithdrawFromWalletResponse> receive(WithdrawFromWalletRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((WithdrawFromWalletCommand) commandMap.getCommand("WithdrawFromWallet")).Run(in));
+        (WithdrawFromWalletResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("WithdrawFromWallet")).Run(in));
   }
 
   @RabbitHandler
@@ -97,9 +95,9 @@ public CompletableFuture<WithdrawFromWalletResponse> receive(WithdrawFromWalletR
   public CompletableFuture<GetFreelancerPaymentRequestsResponse> receive(
       GetFreelancerPaymentRequestsRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetFreelancerPaymentRequestsCommand)
-                commandMap.getCommand("GetFreelancerPaymentRequests"))
-            .Run(in));
+        (GetFreelancerPaymentRequestsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerPaymentRequests"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -107,7 +105,8 @@ public CompletableFuture<GetFreelancerPaymentRequestsResponse> receive(
   public CompletableFuture<GetPaymentRequestResponse> receive(GetPaymentRequestRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetPaymentRequestCommand) commandMap.getCommand("GetPaymentRequest")).Run(in));
+        (GetPaymentRequestResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetPaymentRequest")).Run(in));
   }
 
   @RabbitHandler
@@ -115,21 +114,24 @@ public CompletableFuture<GetPaymentRequestResponse> receive(GetPaymentRequestReq
   public CompletableFuture<PayPaymentRequestResponse> receive(PayPaymentRequestRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((PayPaymentRequestCommand) commandMap.getCommand("PayPaymentRequest")).Run(in));
+        (PayPaymentRequestResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("PayPaymentRequest")).Run(in));
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<CreateWalletResponse> receive(CreateWalletRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((CreateWalletCommand) commandMap.getCommand("CreateWallet")).Run(in));
+        (CreateWalletResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("CreateWallet")).Run(in));
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetWalletResponse> receive(GetWalletRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetWalletCommand) commandMap.getCommand("GetWallet")).Run(in));
+        (GetWalletResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetWallet")).Run(in));
   }
 
   @RabbitHandler
@@ -137,9 +139,9 @@ public CompletableFuture<GetWalletResponse> receive(GetWalletRequest in) throws
   public CompletableFuture<GetClientPaymentTransactionsResponse> receive(
       GetClientPaymentTransactionsRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetClientPaymentTransactionsCommand)
-                commandMap.getCommand("GetClientPaymentTransactions"))
-            .Run(in));
+        (GetClientPaymentTransactionsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetClientPaymentTransactions"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -147,8 +149,8 @@ public CompletableFuture<GetClientPaymentTransactionsResponse> receive(
   public CompletableFuture<GetFreelancerPaymentTransactionsResponse> receive(
       GetFreelancerPaymentTransactionsRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetFreelancerPaymentTransactionsCommand)
-                commandMap.getCommand("GetFreelancerPaymentTransactions"))
-            .Run(in));
+        (GetFreelancerPaymentTransactionsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerPaymentTransactions"))
+                .Run(in));
   }
 }
diff --git a/services/users/src/main/java/com/workup/users/RabbitMQListener.java b/services/users/src/main/java/com/workup/users/RabbitMQListener.java
index 1d13eb51..9aa8de9a 100644
--- a/services/users/src/main/java/com/workup/users/RabbitMQListener.java
+++ b/services/users/src/main/java/com/workup/users/RabbitMQListener.java
@@ -23,8 +23,9 @@ public class RabbitMQListener {
   public CompletableFuture<FreelancerGetProfileBriefResponse> receive(
       FreelancerGetProfileBriefRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((FreelancerGetProfileBriefCommand) commandMap.getCommand("FreelancerGetProfileBrief"))
-            .Run(in));
+        (FreelancerGetProfileBriefResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetProfileBrief"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -32,7 +33,8 @@ public CompletableFuture<FreelancerGetProfileBriefResponse> receive(
   public CompletableFuture<FreelancerGetProfileResponse> receive(FreelancerGetProfileRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((FreelancerGetProfileCommand) commandMap.getCommand("FreelancerGetProfile")).Run(in));
+        (FreelancerGetProfileResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetProfile")).Run(in));
   }
 
   @RabbitHandler
@@ -40,7 +42,8 @@ public CompletableFuture<FreelancerGetProfileResponse> receive(FreelancerGetProf
   public CompletableFuture<FreelancerGetResumeResponse> receive(FreelancerGetResumeRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((FreelancerGetResumeCommand) commandMap.getCommand("FreelancerGetResume")).Run(in));
+        (FreelancerGetResumeResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetResume")).Run(in));
   }
 
   @RabbitHandler
@@ -48,7 +51,8 @@ public CompletableFuture<FreelancerGetResumeResponse> receive(FreelancerGetResum
   public CompletableFuture<FreelancerSetPhotoResponse> receive(FreelancerSetPhotoRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((FreelancerSetPhotoCommand) commandMap.getCommand("FreelancerSetPhoto")).Run(in));
+        (FreelancerSetPhotoResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerSetPhoto")).Run(in));
   }
 
   @RabbitHandler
@@ -56,7 +60,8 @@ public CompletableFuture<FreelancerSetPhotoResponse> receive(FreelancerSetPhotoR
   public CompletableFuture<FreelancerSetProfileResponse> receive(FreelancerSetProfileRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((FreelancerSetProfileCommand) commandMap.getCommand("FreelancerSetProfile")).Run(in));
+        (FreelancerSetProfileResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerSetProfile")).Run(in));
   }
 
   @RabbitHandler
@@ -64,7 +69,8 @@ public CompletableFuture<FreelancerSetProfileResponse> receive(FreelancerSetProf
   public CompletableFuture<FreelancerSetResumeResponse> receive(FreelancerSetResumeRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((FreelancerSetResumeCommand) commandMap.getCommand("FreelancerSetResume")).Run(in));
+        (FreelancerSetResumeResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerSetResume")).Run(in));
   }
 
   @RabbitHandler
@@ -72,7 +78,8 @@ public CompletableFuture<FreelancerSetResumeResponse> receive(FreelancerSetResum
   public CompletableFuture<FreelancerGetPhotoResponse> receive(FreelancerGetPhotoRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((FreelancerGetPhotoCommand) commandMap.getCommand("FreelancerGetPhoto")).Run(in));
+        (FreelancerGetPhotoResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetPhoto")).Run(in));
   }
 
   @RabbitHandler
@@ -80,7 +87,8 @@ public CompletableFuture<FreelancerGetPhotoResponse> receive(FreelancerGetPhotoR
   public CompletableFuture<ClientSetProfileResponse> receive(ClientSetProfileRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((ClientSetProfileCommand) commandMap.getCommand("ClientSetProfile")).Run(in));
+        (ClientSetProfileResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("ClientSetProfile")).Run(in));
   }
 
   @RabbitHandler
@@ -88,7 +96,8 @@ public CompletableFuture<ClientSetProfileResponse> receive(ClientSetProfileReque
   public CompletableFuture<ClientGetProfileResponse> receive(ClientGetProfileRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((ClientGetProfileCommand) commandMap.getCommand("ClientGetProfile")).Run(in));
+        (ClientGetProfileResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("ClientGetProfile")).Run(in));
   }
 
   @RabbitHandler
@@ -96,7 +105,8 @@ public CompletableFuture<ClientGetProfileResponse> receive(ClientGetProfileReque
   public CompletableFuture<ClientSetPhotoResponse> receive(ClientSetPhotoRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((ClientSetPhotoCommand) commandMap.getCommand("ClientSetPhoto")).Run(in));
+        (ClientSetPhotoResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("ClientSetPhoto")).Run(in));
   }
 
   @RabbitHandler
@@ -104,7 +114,8 @@ public CompletableFuture<ClientSetPhotoResponse> receive(ClientSetPhotoRequest i
   public CompletableFuture<ClientGetPhotoResponse> receive(ClientGetPhotoRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((ClientGetPhotoCommand) commandMap.getCommand("ClientGetPhoto")).Run(in));
+        (ClientGetPhotoResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("ClientGetPhoto")).Run(in));
   }
 
   @RabbitHandler
@@ -112,8 +123,9 @@ public CompletableFuture<ClientGetPhotoResponse> receive(ClientGetPhotoRequest i
   public CompletableFuture<AddFreelancerAchievementResponse> receive(
       AddFreelancerAchievementRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((AddFreelancerAchievementCommand) commandMap.getCommand("AddFreelancerAchievement"))
-            .Run(in));
+        (AddFreelancerAchievementResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerAchievement"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -121,7 +133,8 @@ public CompletableFuture<AddFreelancerAchievementResponse> receive(
   public CompletableFuture<AddFreelancerEducationResponse> receive(AddFreelancerEducationRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((AddFreelancerEducationCommand) commandMap.getCommand("AddFreelancerEducation")).Run(in));
+        (AddFreelancerEducationResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerEducation")).Run(in));
   }
 
   @RabbitHandler
@@ -129,8 +142,9 @@ public CompletableFuture<AddFreelancerEducationResponse> receive(AddFreelancerEd
   public CompletableFuture<AddFreelancerExperienceResponse> receive(
       AddFreelancerExperienceRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((AddFreelancerExperienceCommand) commandMap.getCommand("AddFreelancerExperience"))
-            .Run(in));
+        (AddFreelancerExperienceResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerExperience"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -138,7 +152,8 @@ public CompletableFuture<AddFreelancerExperienceResponse> receive(
   public CompletableFuture<AddFreelancerSkillResponse> receive(AddFreelancerSkillRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((AddFreelancerSkillCommand) commandMap.getCommand("AddFreelancerSkill")).Run(in));
+        (AddFreelancerSkillResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerSkill")).Run(in));
   }
 
   @RabbitHandler
@@ -146,7 +161,8 @@ public CompletableFuture<AddFreelancerSkillResponse> receive(AddFreelancerSkillR
   public CompletableFuture<AddFreelancerLanguageResponse> receive(AddFreelancerLanguageRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((AddFreelancerLanguageCommand) commandMap.getCommand("AddFreelancerLanguage")).Run(in));
+        (AddFreelancerLanguageResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerLanguage")).Run(in));
   }
 
   @RabbitHandler
@@ -154,8 +170,9 @@ public CompletableFuture<AddFreelancerLanguageResponse> receive(AddFreelancerLan
   public CompletableFuture<GetFreelancerAchievementsResponse> receive(
       GetFreelancerAchievementsRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetFreelancerAchievementsCommand) commandMap.getCommand("GetFreelancerAchievements"))
-            .Run(in));
+        (GetFreelancerAchievementsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerAchievements"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -163,8 +180,9 @@ public CompletableFuture<GetFreelancerAchievementsResponse> receive(
   public CompletableFuture<GetFreelancerEducationsResponse> receive(
       GetFreelancerEducationsRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetFreelancerEducationsCommand) commandMap.getCommand("GetFreelancerEducations"))
-            .Run(in));
+        (GetFreelancerEducationsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerEducations"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -172,8 +190,9 @@ public CompletableFuture<GetFreelancerEducationsResponse> receive(
   public CompletableFuture<GetFreelancerExperiencesResponse> receive(
       GetFreelancerExperiencesRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetFreelancerExperiencesCommand) commandMap.getCommand("GetFreelancerExperiences"))
-            .Run(in));
+        (GetFreelancerExperiencesResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerExperiences"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -181,7 +200,8 @@ public CompletableFuture<GetFreelancerExperiencesResponse> receive(
   public CompletableFuture<GetFreelancerSkillsResponse> receive(GetFreelancerSkillsRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetFreelancerSkillsCommand) commandMap.getCommand("GetFreelancerSkills")).Run(in));
+        (GetFreelancerSkillsResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerSkills")).Run(in));
   }
 
   @RabbitHandler
@@ -189,7 +209,8 @@ public CompletableFuture<GetFreelancerSkillsResponse> receive(GetFreelancerSkill
   public CompletableFuture<GetFreelancerLanguagesResponse> receive(GetFreelancerLanguagesRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((GetFreelancerLanguagesCommand) commandMap.getCommand("GetFreelancerLanguages")).Run(in));
+        (GetFreelancerLanguagesResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerLanguages")).Run(in));
   }
 
   @RabbitHandler
@@ -197,8 +218,9 @@ public CompletableFuture<GetFreelancerLanguagesResponse> receive(GetFreelancerLa
   public CompletableFuture<UpdateFreelancerAchievementResponse> receive(
       UpdateFreelancerAchievementRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((UpdateFreelancerAchievementCommand) commandMap.getCommand("UpdateFreelancerAchievement"))
-            .Run(in));
+        (UpdateFreelancerAchievementResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("UpdateFreelancerAchievement"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -206,8 +228,9 @@ public CompletableFuture<UpdateFreelancerAchievementResponse> receive(
   public CompletableFuture<UpdateFreelancerEducationResponse> receive(
       UpdateFreelancerEducationRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((UpdateFreelancerEducationCommand) commandMap.getCommand("UpdateFreelancerEducation"))
-            .Run(in));
+        (UpdateFreelancerEducationResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("UpdateFreelancerEducation"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -215,8 +238,9 @@ public CompletableFuture<UpdateFreelancerEducationResponse> receive(
   public CompletableFuture<UpdateFreelancerExperienceResponse> receive(
       UpdateFreelancerExperienceRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((UpdateFreelancerExperienceCommand) commandMap.getCommand("UpdateFreelancerExperience"))
-            .Run(in));
+        (UpdateFreelancerExperienceResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("UpdateFreelancerExperience"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -224,8 +248,9 @@ public CompletableFuture<UpdateFreelancerExperienceResponse> receive(
   public CompletableFuture<RemoveFreelancerAchievementResponse> receive(
       RemoveFreelancerAchievementRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((RemoveFreelancerAchievementCommand) commandMap.getCommand("RemoveFreelancerAchievement"))
-            .Run(in));
+        (RemoveFreelancerAchievementResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerAchievement"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -233,8 +258,9 @@ public CompletableFuture<RemoveFreelancerAchievementResponse> receive(
   public CompletableFuture<RemoveFreelancerEducationResponse> receive(
       RemoveFreelancerEducationRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((RemoveFreelancerEducationCommand) commandMap.getCommand("RemoveFreelancerEducation"))
-            .Run(in));
+        (RemoveFreelancerEducationResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerEducation"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -242,8 +268,9 @@ public CompletableFuture<RemoveFreelancerEducationResponse> receive(
   public CompletableFuture<RemoveFreelancerExperienceResponse> receive(
       RemoveFreelancerExperienceRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((RemoveFreelancerExperienceCommand) commandMap.getCommand("RemoveFreelancerExperience"))
-            .Run(in));
+        (RemoveFreelancerExperienceResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerExperience"))
+                .Run(in));
   }
 
   @RabbitHandler
@@ -251,7 +278,8 @@ public CompletableFuture<RemoveFreelancerExperienceResponse> receive(
   public CompletableFuture<RemoveFreelancerSkillResponse> receive(RemoveFreelancerSkillRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((RemoveFreelancerSkillCommand) commandMap.getCommand("RemoveFreelancerSkill")).Run(in));
+        (RemoveFreelancerSkillResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerSkill")).Run(in));
   }
 
   @RabbitHandler
@@ -259,15 +287,16 @@ public CompletableFuture<RemoveFreelancerSkillResponse> receive(RemoveFreelancer
   public CompletableFuture<RemoveFreelancerLanguageResponse> receive(
       RemoveFreelancerLanguageRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((RemoveFreelancerLanguageCommand) commandMap.getCommand("RemoveFreelancerLanguage"))
-            .Run(in));
+        (RemoveFreelancerLanguageResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerLanguage"))
+                .Run(in));
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<SignUpAndInResponse> receive(LoginRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((LoginCommand) commandMap.getCommand("Login")).Run(in));
+        (LoginResponse) ((Command<CommandRequest, ?>) commandMap.getCommand("Login")).Run(in));
   }
 
   @RabbitHandler
@@ -275,13 +304,15 @@ public CompletableFuture<SignUpAndInResponse> receive(LoginRequest in) throws Ex
   public CompletableFuture<SignUpAndInResponse> receive(FreelancerRegisterRequest in)
       throws Exception {
     return CompletableFuture.completedFuture(
-        ((FreelancerRegisterCommand) commandMap.getCommand("FreelancerRegister")).Run(in));
+        (FreelancerRegisterResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerRegister")).Run(in));
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<SignUpAndInResponse> receive(ClientRegisterRequest in) throws Exception {
     return CompletableFuture.completedFuture(
-        ((ClientRegisterCommand) commandMap.getCommand("ClientRegister")).Run(in));
+        (ClientRegisterResponse)
+            ((Command<CommandRequest, ?>) commandMap.getCommand("ClientRegister")).Run(in));
   }
 }