diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Commands/ApproveWithdrawal/ApproveWithdrawalCommandHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Commands/ApproveWithdrawal/ApproveWithdrawalCommandHandler.cs
index 8bd1d81..7b980cb 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Commands/ApproveWithdrawal/ApproveWithdrawalCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Commands/ApproveWithdrawal/ApproveWithdrawalCommandHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.Commission.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Commands.ApproveWithdrawal;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Commands/RejectWithdrawal/RejectWithdrawalCommandHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Commands/RejectWithdrawal/RejectWithdrawalCommandHandler.cs
index 25df800..abe1bd6 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Commands/RejectWithdrawal/RejectWithdrawalCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Commands/RejectWithdrawal/RejectWithdrawalCommandHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.Commission.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Commands.RejectWithdrawal;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommandHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommandHandler.cs
index f94f2f4..3253189 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommandHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.Commission.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Commands.TriggerWeeklyCalculation;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAllWeeklyPools/GetAllWeeklyPoolsQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAllWeeklyPools/GetAllWeeklyPoolsQueryHandler.cs
index e964511..4eef0ff 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAllWeeklyPools/GetAllWeeklyPoolsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetAllWeeklyPools/GetAllWeeklyPoolsQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.Commission.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetAllWeeklyPools;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserPayouts/GetUserPayoutsQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserPayouts/GetUserPayoutsQueryHandler.cs
index 29d056b..3b85426 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserPayouts/GetUserPayoutsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserPayouts/GetUserPayoutsQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.Commission.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetUserPayouts;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQueryHandler.cs
index 1c78875..abaa982 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetUserWeeklyBalances/GetUserWeeklyBalancesQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.Commission.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetUserWeeklyBalances;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolQueryHandler.cs
index 38ae76f..19dee60 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWeeklyPool/GetWeeklyPoolQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.Commission.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWeeklyPool;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs
index 67097f6..c047837 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.Commission.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWithdrawalReports;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalRequests/GetWithdrawalRequestsQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalRequests/GetWithdrawalRequestsQueryHandler.cs
index 054101e..0875d22 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalRequests/GetWithdrawalRequestsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalRequests/GetWithdrawalRequestsQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.Commission.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWithdrawalRequests;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsQueryHandler.cs
index b119dfd..e66b7d4 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.Commission.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWorkerExecutionLogs;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerStatus/GetWorkerStatusQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerStatus/GetWorkerStatusQueryHandler.cs
index 3d5e766..22fc6a0 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerStatus/GetWorkerStatusQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerStatus/GetWorkerStatusQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.Commission.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.Commission;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWorkerStatus;
 
diff --git a/src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs b/src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs
index 89eef78..ebbc211 100644
--- a/src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs
+++ b/src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs
@@ -18,6 +18,7 @@ using CMSMicroservice.Protobuf.Protos.Tag;
 using CMSMicroservice.Protobuf.Protos.ProductTag;
 using CMSMicroservice.Protobuf.Protos;
 using CMSMicroservice.Protobuf.Protos.ClubMembership;
+using CMSMicroservice.Protobuf.Protos.Commission;
 using CMSMicroservice.Protobuf.Protos.Configuration;
 using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 
@@ -42,7 +43,7 @@ public interface IApplicationContractContext
     UserRoleContract.UserRoleContractClient UserRoles { get; }
     
     // Network & Commission System
-    BackOffice.BFF.Commission.Protobuf.CommissionContract.CommissionContractClient Commissions { get; }
+    CommissionContract.CommissionContractClient Commissions { get; }
     NetworkMembershipContract.NetworkMembershipContractClient NetworkMemberships { get; }
     ClubMembershipContract.ClubMembershipContractClient ClubMemberships { get; }
     ConfigurationContract.ConfigurationContractClient Configurations { get; }
diff --git a/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs b/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs
index 23ede9e..e730c4a 100644
--- a/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs
@@ -1,5 +1,7 @@
 using CMSMicroservice.Protobuf.Protos.ClubMembership;
+using CMSMicroservice.Protobuf.Protos.Commission;
 using CMSMicroservice.Protobuf.Protos.Configuration;
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 using Foursat.BackOffice.BFF.Health.Protobuf;
 
 namespace BackOffice.BFF.Application.HealthCQ.Queries.GetSystemHealth;
@@ -25,7 +27,7 @@ public class GetSystemHealthQueryHandler : IRequestHandler<GetSystemHealthQuery,
         {
             var stopwatch = System.Diagnostics.Stopwatch.StartNew();
             await _context.Commissions.GetAllWeeklyPoolsAsync(
-                new BackOffice.BFF.Commission.Protobuf.GetAllWeeklyPoolsRequest 
+                new GetAllWeeklyPoolsRequest 
                 { 
                     PageIndex = 1, 
                     PageSize = 1 
@@ -89,7 +91,7 @@ public class GetSystemHealthQueryHandler : IRequestHandler<GetSystemHealthQuery,
         {
             var stopwatch = System.Diagnostics.Stopwatch.StartNew();
             await _context.NetworkMemberships.GetNetworkStatisticsAsync(
-                new BackOffice.BFF.NetworkMembership.Protobuf.GetNetworkStatisticsRequest(), 
+                new GetNetworkStatisticsRequest(), 
                 cancellationToken: cancellationToken);
             stopwatch.Stop();
             networkHealthy = true;
diff --git a/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetNetworkHistory/GetNetworkHistoryQueryHandler.cs b/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetNetworkHistory/GetNetworkHistoryQueryHandler.cs
index d236977..77f3aef 100644
--- a/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetNetworkHistory/GetNetworkHistoryQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetNetworkHistory/GetNetworkHistoryQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.NetworkMembership.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 
 namespace BackOffice.BFF.Application.NetworkMembershipCQ.Queries.GetNetworkHistory;
 
diff --git a/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetNetworkStatistics/GetNetworkStatisticsQueryHandler.cs b/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetNetworkStatistics/GetNetworkStatisticsQueryHandler.cs
index fa268e5..645493e 100644
--- a/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetNetworkStatistics/GetNetworkStatisticsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetNetworkStatistics/GetNetworkStatisticsQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.NetworkMembership.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 
 namespace BackOffice.BFF.Application.NetworkMembershipCQ.Queries.GetNetworkStatistics;
 
diff --git a/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetUserNetworkInfo/GetUserNetworkInfoQueryHandler.cs b/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetUserNetworkInfo/GetUserNetworkInfoQueryHandler.cs
index c84a877..ebf9c9b 100644
--- a/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetUserNetworkInfo/GetUserNetworkInfoQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/NetworkMembershipCQ/Queries/GetUserNetworkInfo/GetUserNetworkInfoQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.NetworkMembership.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 
 namespace BackOffice.BFF.Application.NetworkMembershipCQ.Queries.GetUserNetworkInfo;
 
diff --git a/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs b/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs
index 10eded6..7fea027 100644
--- a/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs
+++ b/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs
@@ -10,8 +10,7 @@ using CMSMicroservice.Protobuf.Protos.ProductImages;
 using CMSMicroservice.Protobuf.Protos.ProductGalleries;
 using CMSMicroservice.Protobuf.Protos.Category;
 using CMSMicroservice.Protobuf.Protos.ProductCategory;
-using BackOffice.BFF.Commission.Protobuf;
-using BackOffice.BFF.NetworkMembership.Protobuf;
+
 using FMSMicroservice.Protobuf.Protos.FileInfo;
 using CMSMicroservice.Protobuf.Protos.DiscountProduct;
 using CMSMicroservice.Protobuf.Protos.DiscountCategory;
@@ -21,8 +20,10 @@ using CMSMicroservice.Protobuf.Protos.Tag;
 using CMSMicroservice.Protobuf.Protos.ProductTag;
 using CMSMicroservice.Protobuf.Protos;
 using CMSMicroservice.Protobuf.Protos.ClubMembership;
+using CMSMicroservice.Protobuf.Protos.Commission;
 using CMSMicroservice.Protobuf.Protos.Configuration;
 using CMSMicroservice.Protobuf.Protos.ManualPayment;
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace BackOffice.BFF.Infrastructure.Services;