diff --git a/RFXtoRP_HsaLstCarSta.ftl b/RFXtoRP_HsaLstCarSta.ftl
index 1e41f4f..a8aa244 100644
--- a/RFXtoRP_HsaLstCarSta.ftl
+++ b/RFXtoRP_HsaLstCarSta.ftl
@@ -25,44 +25,44 @@
 		[
 			{
 			 <#switch carrier_apt_status.status.carrier_status_code>
-			    <#case "010"> <#--  Carrier Expected -->
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected> <#-- à revoir -->
+			    <#case "010"> <#--Carrier Expected -->
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected>
 			         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					 "datas" :
 				     <#include "RFXtoRP_HsaLstCarSta_CarrierExpected.ftl">
 			      <#break>
-				<#case "020"> <#--  Carrier Arrived-->
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierArrived> <#-- à revoir -->
+				<#case "020"> <#--Carrier Arrived-->
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierArrived>
 			         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					 "datas" :
 				     <#include "RFXtoRP_HsaLstCarSta_CarrierArrived.ftl">
 			      <#break>
-				<#case "040"> <#--  Unloading Started -->
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingStarted> <#-- à revoir -->
+				<#case "040"> <#--Unloading Started -->
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingStarted>
 			         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					  "datas" :
 				     <#include "RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl">
 			      <#break>
-				<#case "050">  <#--  Unloading Completed-->
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingCompleted> <#-- à revoir -->
+				<#case "050">  <#--Unloading Completed-->
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingCompleted>
 			         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					  "datas" :
 				     <#include "RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl">
 			      <#break>
-				<#case "060">  <#--  Loading Started-->
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentLoadingStarted> <#-- à revoir -->
+				<#case "060">  <#--Loading Started-->
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentLoadingStarted>
 			         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					  "datas" :
 				     <#include "RFXtoRP_HsaLstCarSta_LoadingStarted.ftl">
 			      <#break>
-				<#case "070">  <#--  Loading Completed-->
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentLoadingCompleted> <#-- à revoir -->
+				<#case "070">  <#--Loading Completed-->
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentLoadingCompleted>
 			         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					  "datas" :
 				     <#include "RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl">
 			      <#break>
-				  <#case "090">  <#--  Carrier Departed-->
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierDeparted> <#-- à revoir -->
+				  <#case "090">  <#--Carrier Departed-->
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierDeparted>
 			         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					  "datas" :
 				     <#include "RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl">
diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl
index bdca7af..1151a65 100644
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@@ -52,24 +52,90 @@
         }
       ]
       <#else>
-        <#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
+        <#if carrier_apt.status?? && carrier_apt.status.status_code=="100"> <#--Carrier Arrived-->
         [
           {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierArrived>
+			      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+					  "datas" :
+				    <#include "RFXtoRP_HsaLstCarSta_CarrierArrived.ftl">
           }
         ]
         <#else>
-        [
-          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment> <#-- à revoir-->
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl">
-          }
-        ]
+          <#if carrier_apt.status?? && carrier_apt.status.status_code=="210"> <#--Unloading Started -->
+          [
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingStarted>
+			        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+					    "datas" :
+				      <#include "RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl">
+            }
+          ]
+          <#else>
+            <#if carrier_apt.status?? && carrier_apt.status.status_code=="290"><#--Unloading Completed-->
+            [
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingCompleted>
+			          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl">
+              }
+            ]
+            <#else>
+              <#if carrier_apt.status?? && carrier_apt.status.status_code=="310"><#--Loading Started-->
+              [
+                {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentLoadingStarted>
+			            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+					        "datas" :
+				          <#include "RFXtoRP_HsaLstCarSta_LoadingStarted.ftl">
+                }
+              ]
+              <#else>
+                <#if carrier_apt.status?? && carrier_apt.status.status_code=="390"><#--Loading Completed-->
+                [
+                  {
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentLoadingCompleted>
+			              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+					          "datas" :
+				            <#include "RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl">
+                  }
+                ]
+                <#else>
+                  <#if carrier_apt.status?? && carrier_apt.status.status_code=="500"><#--Carrier Departed-->
+                  [
+                    {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierDeparted>
+			                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+					            "datas" :
+				              <#include "RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl">
+                    }
+                  ]
+                  <#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">
+                      }
+                    ]
+                    <#else>
+                    [
+                      {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment>
+                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                      "datas" :
+                      <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl">
+                      }
+                    ]
+                    </#if>
+                  </#if>
+                </#if>
+              </#if>
+            </#if>
+          </#if>
         </#if>
       </#if>
     <#break>
diff --git a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
index 963902c..5885216 100644
--- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
@@ -1,7 +1,6 @@
 [
     {
 		<#assign creation_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
-
         "Header":{
           "ProjectID": "${projectRP}"
         },
@@ -42,50 +41,26 @@
 				</#if>
 			</#if>
 		</#if>
-		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-		"CustomFields": [
-			{
-			"Key": "depot",
-			"Value": "${carrier_apt.physical_depot?json_string}"
-			},
-			{
-			"Key": "year",
-			"Value": "${carrier_apt.year_number?json_string}"
-			},
-			{
-			"Key": "number",
-			"Value": "${carrier_apt.appointment_number?json_string}"
-			},
-			{
-			"Key": "reference",
-			"Value": "${carrier_apt.appointment_reference?json_string}"
-			},
-			{
-			"Key": "carrier",
-			"Value": "${carrier_apt.planned_carrier?json_string}"
-			}
-		],
 	"Slots": [{
-			<#-- calcul de de la durée en fonction des start et end time-->
-			    "DurationInSeconds": "${duration}",
-			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false" >
-			    <#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}"
+		<#-- calcul de de la durée en fonction des start et end time-->
+			"DurationInSeconds": "${duration}",
+		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false" >
+			<#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">
+				<#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-")>
+					<#stop "planned_load_start_datetime field of appointmend is not initialized" >
+				</#if>
+				"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 			<#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-")>
-			       		<#stop "planned_load_start_datetime field of appointmend is not initialized" >
-		       		</#if>
-			   		"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
-				<#else>
-					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-						<#stop "Not managed">
-					</#if>
+				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+					<#stop "Not managed">
 				</#if>
 			</#if>
+		</#if>
 		}]
 
 	}