diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl
index 8116107..48800b0 100644
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@@ -24,12 +24,6 @@
           "datas" :
           <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl">
         },
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl">
-        },
         {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -120,15 +114,15 @@
                     }
                   ]
                   <#else>
-                    <#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
-                    [
-                      {
-                      <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment>
-                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                      "datas" :
-                      <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
-                      }
-                    ]
+                    <#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
+                      [
+                        {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
+                        }
+                      ]
                     <#else>
                     [
                       {
diff --git a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl
index 81fefce..8769708 100644
--- a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl
@@ -1,38 +1,9 @@
-<#--
- [
- {
-    "Header": {
-        "ProjectID": "${projectRP}"
-    },
-    "ID": {
-    <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-        "RefID": "${carrier_apt.appointment_reference?json_string}",
-    <#else>
-        <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-            "RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-        <#else>
-            "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-        </#if>
-    </#if>
-    }
-    "Payload": {
-    "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-    <#--To configure-->
-<#--    "MetaData": [
-        {
-        "Key": "string",
-        "Value": {
-        "Bool": "true / false",
-        "Float": 3.1415,
-        "Int": 42,
-        "String": "Hello World !",
-        "Timestamp": {
-            "AuthorTimeZone": "Europe/Paris",
-            "DateTime": "2023-01-01T00:00:00Z"
-        }
-        }
-    ]
-    }
-}
-]
+ <#-- A décommenter si besoin de les utiliser-->
+ <#-- Uncomment if you need to use them-->
+ <#--{
+        <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentMetaDataUpdated>
+        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+        "datas" :
+        <#include "RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl">
+        },
 -->
\ No newline at end of file
diff --git a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl
index df69038..81fefce 100644
--- a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl
@@ -17,7 +17,8 @@
     }
     "Payload": {
     "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-    "MetaData": [
+    <#--To configure-->
+<#--    "MetaData": [
         {
         "Key": "string",
         "Value": {
@@ -33,4 +34,5 @@
     ]
     }
 }
-]
\ No newline at end of file
+]
+-->
\ No newline at end of file
diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
index 34a0b14..7bfc9a3 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
@@ -8,7 +8,7 @@
 			"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
 		<#else>
 			<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.appointment_reference?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
 			<#else>
 				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
 			</#if>
@@ -25,7 +25,7 @@
 		   </#if>
 		<#else>
 			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
-			   <#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") ||  carrier_apt.planned_load_end_datetime?starts_with("00") ||  carrier_apt.planned_load_end_datetime?contains("-00-")>
+			   <#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") ||  carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-")>
 			       <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
 		       </#if>
 				<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_LOADING>
@@ -35,10 +35,17 @@
 				</#if>
 			<#else>
 				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#stop "Not managed">
+					<#if  carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") >
+			       	<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
+		       		</#if>
+					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+					<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
+					<#if (duration <= 0)>
+						<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
+					</#if>
 				<#else>
 					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-					<#assign duration = 0 />		<#-- à confirmer -->
+					<#assign duration = 0 />
 				</#if>
 			</#if>
 		</#if>
@@ -76,11 +83,10 @@
 					"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 					<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
 						"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
-						"ExecutionflowID":"${physical_receipt.physical_receipt_reference?json_string}",
 					<#else>
-						"OrderID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
-						"ExecutionflowID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
+						"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
 					</#if>
+					"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
 					"ProjectID": "${projectRP}",
 		            <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
 				}<#sep>,</#sep>
@@ -94,10 +100,14 @@
                     <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
 				}
 			],
-			<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
-				"Reason": "${carrier_apt.appointment_designation?json_string}",
+			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true" && carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
+				"Reason": "LOAD AND UNLOADING / ${carrier_apt.appointment_designation?json_string}",
 			<#else>
-				"Reason": "No commission",
+				<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
+					"Reason": "${carrier_apt.appointment_designation?json_string}",
+				<#else>
+					"Reason": "No commission",
+				</#if>
 			</#if>
 		</#if>
 		"Slots": [{
@@ -107,7 +117,6 @@
 			    <#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
 			       <#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
 		       </#if>
-
 				"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
 			<#else>
 				<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true">
@@ -116,7 +125,12 @@
 		       		</#if>
 			   		"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 				<#else>
-						<#stop "Not managed">
+					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+						<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
+							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
+						</#if>
+						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+					</#if>
 				</#if>
 			</#if>
 		}]
diff --git a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
index 0517881..8e424ff 100644
--- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
@@ -35,10 +35,19 @@
 				</#if>
 			<#else>
 				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#stop "Not managed">
-				<#else>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-					<#assign duration = 0 />		<#-- à confirmer -->
+					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+						<#if  carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") >
+							<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
+						</#if>
+						<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+						<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
+						<#if (duration <= 0)>
+							<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
+						</#if>
+					<#else>
+						<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
+						<#assign duration = 0 />		<#-- à confirmer -->
+					</#if>
 				</#if>
 			</#if>
 		</#if>
@@ -70,14 +79,13 @@
 			<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
 			{
 				"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-			<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
-				"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
-				"ExecutionflowID":"${physical_receipt.physical_receipt_reference?json_string}",
-			<#else>
-				"OrderID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
-				"ExecutionflowID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
-			</#if>
-					"ProjectID": "${projectRP}"
+				<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
+					"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
+				<#else>
+					"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
+				</#if>
+				"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
+				"ProjectID": "${projectRP}"
 			}<#sep>,</#sep>
 			</#list>
 			],
diff --git a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
index ba02b47..4c5b120 100644
--- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
@@ -35,7 +35,14 @@
 				</#if>
 			<#else>
 				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#stop "Not managed">
+					<#if  carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") >
+			       		<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
+		       		</#if>
+					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+					<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
+					<#if (duration <= 0)>
+						<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
+					</#if>
 				<#else>
 					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
 					<#assign duration = 0 />		<#-- à confirmer -->
@@ -58,7 +65,10 @@
 				"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 			<#else>
 				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#stop "Not managed">
+						<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
+							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
+						</#if>
+						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
 				</#if>
 			</#if>
 		</#if>
diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index 5b5507c..b1919f8 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -26,6 +26,7 @@
             "datas" :
             <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
             },
+            <#include "RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl">
             {
 
             <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
diff --git a/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl b/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl
new file mode 100644
index 0000000..3cf29a6
--- /dev/null
+++ b/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl
@@ -0,0 +1,27 @@
+<#--
+{
+    "Header": {
+    "ProjectID": "${projectRP}"
+    },
+    "ID":{
+    "RefID": "${Your_Object_ID}"
+    },
+    "Payload":{
+        "MetaData": [
+        {
+        "Key": "string",
+        "Value": {
+        "Bool": "true / false",
+        "Float": 3.1415,
+        "Int": 42,
+        "String": "Hello World !",
+        "Timestamp": {
+            "AuthorTimeZone": "Europe/Paris",
+            "DateTime": "2023-01-01T00:00:00Z"
+            }
+        }
+        }
+        ]
+    }
+}
+-->
\ No newline at end of file
diff --git a/RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl b/RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl
new file mode 100644
index 0000000..93a3827
--- /dev/null
+++ b/RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl
@@ -0,0 +1,10 @@
+ <#-- A décommenter si besoin de les utiliser-->
+ <#-- Uncomment if you need to use them-->
+<#--
+{
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowMetaDataUpdated>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl">
+            },
+-->
\ No newline at end of file
diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl
index 21be0c7..0ee48cc 100644
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -27,21 +27,24 @@
 	<#case "CommissionsUpdated">
 		<#assign appointment = eventRP.data />
 		[
+			<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as commission>
 			<#if eventRP.appointmentCustomFields?has_content>
-			{
-				<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
-				"apiRestReflexID" :  "${apiRestReflexID}",
-				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl">
-			}
-			<#else>
-			{
-				<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref>
-				"apiRestReflexID" :  "${apiRestReflexID}",
-				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
-			}
+				{
+					<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
+					"apiRestReflexID" :  "${apiRestReflexID}",
+					"datas" :
+					<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl">
+				}
+				<#else>
+				{
+					<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref>
+					"apiRestReflexID" :  "${apiRestReflexID}",
+					"datas" :
+					<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
+				}
 			</#if>
+			<#sep>,</#sep>
+			</#list>
 		]
 	<#break>
 <#-- *********************************************** Action = SlotUpdated ******************** -->
diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index 017cee7..820c79d 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -12,15 +12,25 @@
 	       <#case "APPOINTMENT_TYPE_LOADING">
 			   "unloading_appointment" : "false",
 			   "load_appointment" : "true",
-               "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
-               "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
-		   <#break>
+              <#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+				<#else>
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+				</#if>
+			<#break>
 		   <#case  "APPOINTMENT_TYPE_UNLOADING">
 		       "unloading_appointment" : "true",
 			   "load_appointment" : "false",
-			   "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
-               "planned_unloading_end_datetime"   : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
-		   <#break>
+			   <#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		<#else>
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+		   		</#if>
+			<#break>
 	       <#default>
 	         <#stop "appointment.AppointmentType not implemented" >
         </#switch>
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
index 3a6ba80..fd9e237 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
@@ -12,20 +12,17 @@
 		<#if appointment.Commissions??>
 			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 				"physical_receipt_list": [
-				<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as 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}"
+					"receipt_activity": "${commission.value.activity_code?json_string}",
+					"originator_code": "${commission.value.originator_code?json_string}",
+					"physical_receipt_reference": "${commission.value.reference?json_string}",
+					"receipt_year": "${commission.value.order_year?json_string}",
+					"receipt_number": "${commission.value.order_number?json_string}"
 				}
-				<#sep>,</#sep>
-				</#list>
 				]
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					"appointment_designation":"LOADING"
+					"appointment_designation":"${appointment.Reason!""?json_string}"
 				</#if>
 			</#if>
 		</#if>
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
index e5b91cf..223b1cb 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
@@ -11,20 +11,17 @@
 		<#if appointment.Commissions??>
 			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 				"physical_receipt_list": [
-				<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as 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}"
+					"receipt_activity": "${commission.value.activity_code?json_string}",
+					"originator_code": "${commission.value.originator_code?json_string}",
+					"physical_receipt_reference": "${commission.value.reference?json_string}",
+					"receipt_year": "${commission.value.order_year?json_string}",
+					"receipt_number": "${commission.value.order_number?json_string}"
 				}
-				<#sep>,</#sep>
-				</#list>
 				]
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					"appointment_designation":"LOADING"
+					"appointment_designation":"${appointment.Reason!""?json_string}"
 				</#if>
 			</#if>
 		</#if>
diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl
index efd5dfc..d362dfe 100644
--- a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl
@@ -13,15 +13,25 @@
 	       <#case "APPOINTMENT_TYPE_LOADING">
 				"unloading_appointment" : "false",
 				"load_appointment" : "true",
-				"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
-				"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
-		   <#break>
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+				<#else>
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+				</#if>
+			<#break>
 		   <#case  "APPOINTMENT_TYPE_UNLOADING">
-				"unloading_appointment" : "true",
-				"load_appointment" : "false",
-				"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
-            	"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
-		   	<#break>
+		       "unloading_appointment" : "true",
+			   "load_appointment" : "false",
+			   <#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		<#else>
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+		   		</#if>
+			<#break>
 	       <#default>
 	         <#stop "appointment.AppointmentType not implemented" >
         </#switch>
diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl
index b7f102d..49b4579 100644
--- a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl
@@ -12,15 +12,25 @@
 	       <#case "APPOINTMENT_TYPE_LOADING">
 				"unloading_appointment" : "false",
 				"load_appointment" : "true",
-				"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
-				"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
-		   <#break>
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+				<#else>
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+				</#if>
+			<#break>
 		   <#case  "APPOINTMENT_TYPE_UNLOADING">
-				"unloading_appointment" : "true",
-				"load_appointment" : "false",
-				"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
-				"planned_unloading_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
-		   	<#break>
+		       "unloading_appointment" : "true",
+			   "load_appointment" : "false",
+			   <#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		<#else>
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+		   		</#if>
+				<#break>
 	       <#default>
 	         <#stop "appointment.AppointmentType not implemented" >
         </#switch>
diff --git a/VERSION b/VERSION
index 26e162a..fc83bb1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.52+1
+1.2.52+2