diff --git a/TransactionProcessor.Mobile.BusinessLogic/Services/Factory.cs b/TransactionProcessor.Mobile.BusinessLogic/Services/Factory.cs
new file mode 100644
index 00000000..b75f4f11
--- /dev/null
+++ b/TransactionProcessor.Mobile.BusinessLogic/Services/Factory.cs
@@ -0,0 +1,74 @@
+using TransactionProcessor.Mobile.BusinessLogic.Common;
+using TransactionProcessor.Mobile.BusinessLogic.Models;
+using TransactionProcessorACL.DataTransferObjects.Responses;
+
+namespace TransactionProcessor.Mobile.BusinessLogic.Services;
+
+public static class Factory {
+    public static PerformBillPaymentGetAccountResponseModel ToPerformBillPaymentGetAccountResponseModel(SaleTransactionResponseMessage responseMessage) {
+        return new PerformBillPaymentGetAccountResponseModel() {
+            BillDetails = responseMessage.AdditionalResponseMetadata.ToBillDetails()
+        };
+    }
+
+    public static PerformBillPaymentMakePaymentResponseModel ToPerformBillPaymentMakePaymentResponseModel(SaleTransactionResponseMessage responseMessage) {
+        return new()
+        {
+            EstateId = responseMessage.EstateId,
+            MerchantId = responseMessage.MerchantId,
+            ResponseCode = responseMessage.ResponseCode,
+            ResponseMessage = responseMessage.ResponseMessage
+        };
+    }
+
+    public static PerformBillPaymentGetMeterResponseModel ToPerformBillPaymentGetMeterResponseModel(SaleTransactionResponseMessage responseMessage, String meterNumber) {
+        MeterDetails meterDetails = responseMessage.AdditionalResponseMetadata switch{
+            null => null,
+            _ => responseMessage.AdditionalResponseMetadata.ToMeterDetails(meterNumber)
+        };
+        return new PerformBillPaymentGetMeterResponseModel() {
+            MeterDetails = meterDetails
+        };
+    }
+
+    public static PerformLogonResponseModel ToPerformLogonResponseModel(LogonTransactionResponseMessage responseMessage) {
+        return new()
+        {
+            EstateId = responseMessage.EstateId,
+            MerchantId = responseMessage.MerchantId,
+            ResponseCode = responseMessage.ResponseCode,
+            ResponseMessage = responseMessage.ResponseMessage,
+        };
+    }
+
+    public static PerformMobileTopupResponseModel ToPerformMobileTopupResponseModel(SaleTransactionResponseMessage responseMessage)
+    {
+        return new()
+        {
+            EstateId = responseMessage.EstateId,
+            MerchantId = responseMessage.MerchantId,
+            ResponseCode = responseMessage.ResponseCode,
+            ResponseMessage = responseMessage.ResponseMessage,
+        };
+    }
+
+    public static PerformReconciliationResponseModel ToPerformReconciliationResponseModel(ReconciliationResponseMessage responseMessage) {
+        return new()
+        {
+            EstateId = responseMessage.EstateId,
+            MerchantId = responseMessage.MerchantId,
+            ResponseCode = responseMessage.ResponseCode,
+            ResponseMessage = responseMessage.ResponseMessage
+        };
+    }
+
+    public static PerformVoucherIssueResponseModel ToPerformVoucherIssueResponseModel(SaleTransactionResponseMessage responseMessage) {
+        return new()
+        {
+            EstateId = responseMessage.EstateId,
+            MerchantId = responseMessage.MerchantId,
+            ResponseCode = responseMessage.ResponseCode,
+            ResponseMessage = responseMessage.ResponseMessage
+        };
+    }
+}
\ No newline at end of file
diff --git a/TransactionProcessor.Mobile.BusinessLogic/Services/TransactionService.cs b/TransactionProcessor.Mobile.BusinessLogic/Services/TransactionService.cs
index e3d53cef..0db1abe0 100644
--- a/TransactionProcessor.Mobile.BusinessLogic/Services/TransactionService.cs
+++ b/TransactionProcessor.Mobile.BusinessLogic/Services/TransactionService.cs
@@ -33,7 +33,6 @@ public interface ITransactionService
         #endregion
     }
 
-    //[ExcludeFromCodeCoverage(Justification = "Need to refactor to allow injection of client for mocking")]
     public class TransactionService : ClientProxyBase.ClientProxyBase, ITransactionService
     {
         #region Fields
@@ -66,16 +65,12 @@ public async Task<Result<PerformBillPaymentGetAccountResponseModel>> PerformBill
 
             Result<SaleTransactionResponseMessage> result = await this.SendTransactionRequest<SaleTransactionRequestMessage, SaleTransactionResponseMessage>(model.ToSaleTransactionRequest(), "api/saletransactions", cancellationToken);
 
-            if (result.IsSuccess == false)
-            {
+            if (result.IsSuccess == false) {
                 Logger.LogWarning("Error performing bill payment - get account transaction");
                 return Result.Failure("Error performing bill payment - get account transaction");
             }
 
-            PerformBillPaymentGetAccountResponseModel responseModel = new()
-                                                                      {
-                                                                          BillDetails = result.Data.AdditionalResponseMetadata.ToBillDetails()
-                                                                      };
+            PerformBillPaymentGetAccountResponseModel responseModel = Factory.ToPerformBillPaymentGetAccountResponseModel(result.Data);
 
             Logger.LogInformation("Bill payment - get account transaction performed successfully");
 
@@ -87,22 +82,13 @@ public async Task<Result<PerformBillPaymentMakePaymentResponseModel>> PerformBil
             Logger.LogInformation("About to perform bill payment make payment transaction");
             
             Result<SaleTransactionResponseMessage> result = await this.SendTransactionRequest<SaleTransactionRequestMessage, SaleTransactionResponseMessage>(model.ToSaleTransactionRequest(),"api/saletransactions", cancellationToken);
-            
-            if (result.IsSuccess == false)
-            {
+
+            if (result.IsSuccess == false) {
                 Logger.LogWarning("Error performing bill payment - make payment transaction");
                 return Result.Failure("Error performing bill payment - make payment transaction");
-
             }
 
-            // TODO: Factory
-            PerformBillPaymentMakePaymentResponseModel responseModel = new()
-                                                                       {
-                                                                           EstateId = result.Data.EstateId,
-                                                                           MerchantId = result.Data.EstateId,
-                                                                           ResponseCode = result.Data.ResponseCode,
-                                                                           ResponseMessage = result.Data.ResponseMessage
-                                                                       };
+            PerformBillPaymentMakePaymentResponseModel responseModel = Factory.ToPerformBillPaymentMakePaymentResponseModel(result.Data);
 
             Logger.LogInformation("Bill payment - make payment transaction performed successfully");
 
@@ -114,22 +100,12 @@ public async Task<Result<PerformBillPaymentGetMeterResponseModel>> PerformBillPa
 
             Result<SaleTransactionResponseMessage> result = await this.SendTransactionRequest<SaleTransactionRequestMessage, SaleTransactionResponseMessage>(model.ToSaleTransactionRequest(), "api/saletransactions", cancellationToken);
 
-            if (result.IsSuccess == false)
-            {
+            if (result.IsSuccess == false) {
                 Logger.LogWarning("Error performing bill payment - get meter transaction");
                 return Result.Failure("Error performing bill payment - get meter transaction");
-
             }
 
-            MeterDetails meterDetails = result.Data.AdditionalResponseMetadata switch{
-                null => null,
-                _ => result.Data.AdditionalResponseMetadata.ToMeterDetails(model.MeterNumber)
-            };
-
-            PerformBillPaymentGetMeterResponseModel responseModel = new()
-                                                                    {
-                                                                        MeterDetails = meterDetails
-            };
+            PerformBillPaymentGetMeterResponseModel responseModel = Factory.ToPerformBillPaymentGetMeterResponseModel(result.Data, model.MeterNumber);
 
             Logger.LogInformation("Bill payment - get meter transaction performed successfully");
 
@@ -148,14 +124,7 @@ public async Task<Result<PerformLogonResponseModel>> PerformLogon(PerformLogonRe
                 return Result.Failure("Error performing Logon transaction");
             }
 
-            // TODO: Factory
-            PerformLogonResponseModel responseModel = new()
-                                                      {
-                                                          EstateId = result.Data.EstateId,
-                                                          MerchantId = result.Data.MerchantId,
-                                                          ResponseCode = result.Data.ResponseCode,
-                                                          ResponseMessage = result.Data.ResponseMessage,
-                                                      };
+            PerformLogonResponseModel responseModel = Factory.ToPerformLogonResponseModel(result.Data);
 
             Logger.LogInformation("Logon transaction performed successfully");
 
@@ -172,15 +141,9 @@ public async Task<Result<PerformMobileTopupResponseModel>> PerformMobileTopup(Pe
             if (result.IsSuccess == false) {
                 Logger.LogWarning("Error performing Mobile top-up transaction");
                 return Result.Failure("Error performing Mobile top-up transaction");
-                
             }
 
-            PerformMobileTopupResponseModel responseModel = new (){
-                                                                                                    EstateId = result.Data.EstateId,
-                                                                                                    MerchantId = result.Data.MerchantId,
-                                                                                                    ResponseCode = result.Data.ResponseCode,
-                                                                                                    ResponseMessage = result.Data.ResponseMessage
-                                                                                                };
+            PerformMobileTopupResponseModel responseModel = Factory.ToPerformMobileTopupResponseModel(result.Data);
 
             Logger.LogInformation("Mobile top-up transaction performed successfully");
 
@@ -198,17 +161,9 @@ public async Task<Result<PerformReconciliationResponseModel>> PerformReconciliat
             {
                 Logger.LogWarning("Error performing Reconciliation transaction");
                 return Result.Failure("Error performing Reconciliation transaction");
-
             }
 
-            // TODO: Factory
-            PerformReconciliationResponseModel responseModel = new()
-                                                               {
-                                                                   EstateId = result.Data.EstateId,
-                                                                   MerchantId = result.Data.MerchantId,
-                                                                   ResponseCode = result.Data.ResponseCode,
-                                                                   ResponseMessage = result.Data.ResponseMessage
-                                                               };
+            PerformReconciliationResponseModel responseModel = Factory.ToPerformReconciliationResponseModel(result.Data);
 
             Logger.LogInformation("Reconciliation transaction performed successfully");
 
@@ -228,13 +183,7 @@ public async Task<Result<PerformVoucherIssueResponseModel>> PerformVoucherIssue(
                 return Result.Failure("Error performing Voucher transaction");
             }
 
-            PerformVoucherIssueResponseModel responseModel = new()
-                                                             {
-                                                                 EstateId = result.Data.EstateId,
-                                                                 MerchantId = result.Data.MerchantId,
-                                                                 ResponseCode = result.Data.ResponseCode,
-                                                                 ResponseMessage = result.Data.ResponseMessage
-                                                             };
+            PerformVoucherIssueResponseModel responseModel = Factory.ToPerformVoucherIssueResponseModel(result.Data);
 
             Logger.LogInformation("Voucher transaction performed successfully");