diff --git a/CallbackHander.Testing/TestData.cs b/CallbackHander.Testing/TestData.cs
index 27b46ab..6212a21 100644
--- a/CallbackHander.Testing/TestData.cs
+++ b/CallbackHander.Testing/TestData.cs
@@ -43,7 +43,7 @@ public static CallbackMessageAggregate RecordedCallbackMessageAggregate()
     {
         CallbackMessageAggregate aggregate = new();
         aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, (MessageFormat)TestData.MessageFormat,
-            TestData.CallbackMessage, TestData.Reference, TestData.Destinations, EstateReference, MerchantReference);
+            TestData.CallbackMessage, TestData.Destinations,(TestData.Reference, EstateReference, MerchantReference));
 
         return aggregate;
     }
diff --git a/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs b/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs
index edffe6f..0f822bf 100644
--- a/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs
+++ b/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs
@@ -40,8 +40,8 @@ public async Task<Result> RecordCallback(CallbackCommands.RecordCallbackCommand
             DomainServiceHelper.HandleGetAggregateResult(getResult, command.CallbackId, false);
 
         CallbackMessageAggregate aggregate = callbackMessageAggregateResult.Data;
-        Result stateResult = aggregate.RecordCallback(command.CallbackId, command.TypeString, command.MessageFormat, command.CallbackMessage, command.Reference, command.Destinations,
-            Guid.Parse(estateReference), Guid.Parse(merchantReference));
+        Result stateResult = aggregate.RecordCallback(command.CallbackId, command.TypeString, command.MessageFormat, command.CallbackMessage, command.Destinations,
+            (command.Reference, Guid.Parse(estateReference), Guid.Parse(merchantReference)));
         if (stateResult.IsFailed)
             return stateResult;
         return await this.AggregateRepository.SaveChanges(aggregate, cancellationToken);
diff --git a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackMessageAggregateTests.cs b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackMessageAggregateTests.cs
index cfa2c88..8433ac0 100644
--- a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackMessageAggregateTests.cs
+++ b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackMessageAggregateTests.cs
@@ -22,8 +22,8 @@ public void CallbackMessageAggregate_RecordCallback_CallbackIsRecorded()
     {
         CallbackMessageAggregate aggregate = new();
 
-        Result result = aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, MessageFormat.JSON, TestData.CallbackMessage, TestData.Reference, TestData.Destinations,
-            TestData.EstateReference, TestData.MerchantReference);
+        Result result = aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, MessageFormat.JSON, TestData.CallbackMessage, TestData.Destinations,
+            (TestData.Reference, TestData.EstateReference, TestData.MerchantReference));
         result.IsSuccess.ShouldBeTrue();
 
         aggregate.ShouldSatisfyAllConditions(() => aggregate.CallbackMessage.ShouldBe(TestData.CallbackMessage),
diff --git a/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs b/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs
index 843a1b3..7c30b5b 100644
--- a/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs
+++ b/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs
@@ -54,12 +54,10 @@ public static Result RecordCallback(this CallbackMessageAggregate aggregate,
                                         String typeString,
                                         MessageFormat messageFormat,
                                         String callbackMessage,
-                                        String reference,
                                         String[] destinations,
-                                        Guid estateId,
-                                        Guid merchantId) {
+                                        (String reference, Guid estateId, Guid merchantId) referenceFields) {
         foreach (String destination in destinations) {
-            CallbackReceivedEvent callbackReceivedEvent = new (aggregateId, typeString, (Int32)messageFormat, callbackMessage, reference, destination, estateId, merchantId);
+            CallbackReceivedEvent callbackReceivedEvent = new (aggregateId, typeString, (Int32)messageFormat, callbackMessage, referenceFields.reference, destination, referenceFields.estateId, referenceFields.merchantId);
 
             aggregate.ApplyAndAppend(callbackReceivedEvent);
         }