diff --git a/src/Dojo.Net.EPOS.Server/Schema/CardMachineRequestorInfo.cs b/src/Dojo.Net.EPOS.Server/Schema/CardMachineRequestorInfo.cs
index 664db3f..1e34636 100644
--- a/src/Dojo.Net.EPOS.Server/Schema/CardMachineRequestorInfo.cs
+++ b/src/Dojo.Net.EPOS.Server/Schema/CardMachineRequestorInfo.cs
@@ -2,8 +2,8 @@ namespace Dojo.Net.EPOS.Server.Schema
 {
     public class CardMachineRequestorInfo
     {
-        string? TerminalId { get; set; }
+        public string? TerminalId { get; set; }
 
-        int? WaiterId { get; set; }
+        public int? WaiterId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Dojo.Net.EPOS.Server/Schema/Payment.cs b/src/Dojo.Net.EPOS.Server/Schema/Payment.cs
index 0510182..8f23a24 100644
--- a/src/Dojo.Net.EPOS.Server/Schema/Payment.cs
+++ b/src/Dojo.Net.EPOS.Server/Schema/Payment.cs
@@ -65,9 +65,10 @@ public class RemotePaymentInfo
     public class PaymentMethodDetails
     {
         public PaymentMethod Method { get; set; }
-        public RemotePaymentStatus? RemotePaymentStatus { get; set; }
-        public CardPresentPaymentStatus? CardPresentPaymentStatus { get; set; }
+        public RemotePaymentStatus? RemotePaymentStatus { get; set; }        
         public RemotePaymentInfo? RemotePaymentInfo { get; set; }
+        public CardPresentPaymentStatus? CardPresentPaymentStatus { get; set; }
+        public CardPresentPaymentInfo? CardPresentPaymentInfo { get; set; }
     }
 
     public enum CardholderVerificationMethod