diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociation.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociation.ftl
index 3868fed..7117380 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociation.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociation.ftl
@@ -12,11 +12,14 @@
 		    "physical_receipt_list": [
 			<#list appointment.Commissions as commission>
 			{
-				"receipt_activity": "${eventRP.executionflowCustomFields.activity_code?json_string}",
-				"originator_code": "${eventRP.executionflowCustomFields.originator_code?json_string}",
-				"physical_receipt_reference": "${eventRP.executionflowCustomFields.reference?json_string}",
-				"receipt_year": "${eventRP.executionflowCustomFields.order_year?json_string}",
-				"receipt_number": "${eventRP.executionflowCustomFields.order_number?json_string}"
+				<#list eventRP.executionflowCustomFields.entrySet() as custom>
+				${custom}
+				"receipt_activity": "${custom.value.activity_code?json_string}",
+				"originator_code": "${custom.value.originator_code?json_string}",
+				"physical_receipt_reference": "${custom.value.reference?json_string}",
+				"receipt_year": "${custom.value.order_year?json_string}",
+				"receipt_number": "${custom.value.order_number?json_string}"
+				</#list>
 			 }
 			 <#sep>,</#sep>
 			 </#list>