diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl
index 9437a90..d2e33d6 100644
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -17,49 +17,58 @@
       <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
       [
          <#if preparationStatusInterface.preparation_type_code=="010" || preparationStatusInterface.preparation_type_code=="030">
-         <#--**Pick batch runned (200) **-->
-            <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
-               }
+         <#--**Generation (100) **-->
+         <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "100" >
+            {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsaProStatus_ExecutionflowCustomFieldsUpdated.ftl">
+            }
             <#else>
-               <#-- ** Collection started (300) and Preparation in progress (400)** -->
-               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
+               <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
                   {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
                   "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                   "datas" :
-                     <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
+                  <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
                   }
                <#else>
-                     <#-- ****Preparation dispatched (600)** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
-                        {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                           <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
-                        },
-                        {
-                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
-                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                           "datas" :
-                              <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
-                        }
+                  <#-- ** Collection started (300) and Preparation in progress (400)** -->
+                  <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
+                     {
+                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
+                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                     "datas" :
+                        <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
+                     }
                   <#else>
-                        <#-- ****Preparation cancelled (650)**** -->
-                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                        <#-- ****Preparation dispatched (600)** -->
+                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
                            {
-                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
                            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                            "datas" :
-                              <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
+                              <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
+                           },
+                           {
+                              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
+                              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                              "datas" :
+                                 <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
                            }
                      <#else>
-                           <#stop>
+                           <#-- ****Preparation cancelled (650)**** -->
+                        <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                              {
+                              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                              "datas" :
+                                 <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
+                              }
+                        <#else>
+                              <#stop>
+                        </#if>
                      </#if>
                   </#if>
                </#if>
diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCustomFieldsUpdated.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCustomFieldsUpdated.ftl
new file mode 100644
index 0000000..b79e4c1
--- /dev/null
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCustomFieldsUpdated.ftl
@@ -0,0 +1,52 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+    {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "Payload" :{},
+        "ID":{
+            "CustomFields": [
+            {
+                "Key": "depot_code",
+                "Value": "${preparationStatusInterface.physical_depot_code?trim?json_string}"
+            },
+            {
+                "Key": "activity_code",
+                "Value": "${preparationStatusInterface.activity_code?trim?json_string}"
+            },
+            {
+                "Key": "originator_code",
+                "Value": "${preparationStatusInterface.preparation_order_originator_code?trim?json_string}"
+            },
+            {
+                "Key": "reference",
+                "Value": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}"
+            },
+            {
+                "Key": "order_year",
+                "Value": "${preparationStatusInterface.preparation_order_year}"
+            },
+             {
+                "Key": "order_number",
+                "Value": "${preparationStatusInterface.preparation_order_number}"
+            },
+             {
+                "Key": "preparation_year",
+                "Value": "${preparationStatusInterface.preparation_year}"
+            },
+             {
+                "Key": "preparation_number",
+                "Value": "${preparationStatusInterface.preparation_number}"
+            }
+        ],
+        <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+            "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        <#else>
+            "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+        </#if>
+        }
+    }
+]
\ No newline at end of file