diff --git a/RFXtoRP_PlatformLogCreate.ftl b/RFXtoRP_PlatformLogCreate.ftl
index f48b2b9..ee2be4f 100644
--- a/RFXtoRP_PlatformLogCreate.ftl
+++ b/RFXtoRP_PlatformLogCreate.ftl
@@ -33,7 +33,7 @@
 	    "DetailElements": [],
 	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
 	    "ContextPayload": ${strJsonBody},
-	    "Type": "RP_EXECUTIONFLOW_EVENT",
+	    "Type": ${event},
 	    "Task": "${id.apiRestReflexID!"no Task"}",
 	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
 	    "StackTrace": ""
diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl
index 70928b3..d4b338e 100644
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -12,7 +12,7 @@
 <#assign aDateTime = .now>
 <#assign no_apiRestReflexID = "no apiRestReflexID">
 <#assign no_status = -99999>
-
+<#assign event = "UNKNOW_EVENT" >
 
 <#switch id.apiRestReflexID!no_apiRestReflexID>
 	<#case no_apiRestReflexID>
@@ -44,6 +44,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -84,6 +85,7 @@
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 							"datas" :
+							    <#assign event = "RP_EXECUTIONFLOW_EVENT">
 								<#include "RFXtoRP_PlatformLogCreate.ftl">
 						},
 						{
@@ -107,6 +109,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -132,6 +135,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -162,6 +166,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -184,6 +189,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_EXECUTIONFLOW_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -209,6 +215,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -236,6 +243,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -258,6 +266,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -284,6 +293,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -311,6 +321,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -333,6 +344,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -359,6 +371,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -386,6 +399,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -408,6 +422,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -436,6 +451,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
@@ -463,6 +479,7 @@
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
+						<#assign event = "RP_APPOINTMENT_EVENT" />
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
@@ -485,6 +502,7 @@
 					<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
+					<#assign event = "RP_APPOINTMENT_EVENT" />
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl
index 642c168..3c219bf 100644
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -24,10 +24,12 @@
 		]
 		<#break>
 <#-- *********************************************** Action = CommissionsUpdated ******************** -->
-	<#case "CommissionsUpdated">
+	<#case "Updated">
+	    <#assign AddComma = false />
 		<#assign appointment = eventRP.data />
-		[	<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-				<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">				    
+	[
+		<#if eventRP.commissionsUpdated>
+			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedCommissions?? && eventRP.addedCommissions !="">
 					<#if eventRP.appointmentCustomFields?has_content>
 						{
 							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
@@ -43,9 +45,10 @@
 							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
 						}
 					</#if>
+				<#assign AddComma = true />
 				</#if>
-				<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
-					<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">
+			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedCommissions?? && eventRP.removedCommissions!="">
+				<#if AddComma == true>
 					   ,
 					</#if>	
 
@@ -64,32 +67,14 @@
 						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
 					}
 					</#if>
+				<#assign AddComma = true />
 				</#if>
-			<#else>
-				<#if eventRP.appointmentCustomFields?has_content>
-				{
-					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
-					"apiRestReflexID" :  "${apiRestReflexID}",
-					"datas" :
-					<#include "RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl">
-				}
-				<#else>
-				{
-					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
-					"apiRestReflexID" :  "${apiRestReflexID}",
-					"datas" :
-					<#include "RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl">
-				}
 				</#if>
+<#-- *********************************************** Action = reasonUpdated or slotUpdated ******************** -->
+		<#if eventRP.reasonUpdated   || eventRP.slotUpdated  || eventRP.carrierInformationUpdated>
+			<#if AddComma == true>
+				,
 			</#if>
-		]
-	<#break>
-<#-- *********************************************** Action = SlotUpdated or CarrierInformationUpdated ******************** -->
-	<#case "SlotUpdated">
-	<#case "CarrierInformationUpdated">
-	<#case "ReasonUpdated">
-		<#assign appointment = eventRP.data />
-		[
 			<#if eventRP.appointmentCustomFields?has_content>
 			{
 				<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
@@ -105,6 +90,8 @@
 				<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl">
 			}
 			</#if>
+			<#assign AddComma = true />
+        </#if>
 		]
 	<#break>
 <#-- *********************************************** Action = SlotUpdated ******************** -->
diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index 7c34845..7eef060 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -56,10 +56,7 @@
 				</#if>
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
 						"appointment_designation":"${(appointment.Reason!"")?json_string}",
-					</#if>
-				</#if>
 			</#if>
 		</#if>
 		"constant_appointment": "false"