diff --git a/RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl b/RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl
index 7c35b0f..f013ed3 100644
--- a/RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl
@@ -1,4 +1,3 @@
-<#-- **** file included in RFXtoRP_HsaItm_ItemCreated.ftl  ***** -->
 <#-- use protobuf of class HsaCarrier to find Reflex WMS fields names  -->
 
 
diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl
index 788df93..2d495e8 100644
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -15,7 +15,7 @@
       <#-- "PartnerID": "${}",  -->
 
     <#--
-    <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">
+    <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,
     -->
 
 
diff --git a/RFXtoRP_HsaCons_ActorCreated_Metadata.ftl b/RFXtoRP_HsaCons_ActorCreated_Metadata.ftl
index 8bdbc3e..19decec 100644
--- a/RFXtoRP_HsaCons_ActorCreated_Metadata.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated_Metadata.ftl
@@ -1,5 +1,4 @@
-<#-- **** file included in RFXtoRP_HsaItm_ItemCreated.ftl  ***** -->
 <#-- use protobuf of class HsaCons to find Reflex WMS fields names  -->
 
 
-"MetaData": [        ],
\ No newline at end of file
+"MetaData": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl
index 089a70a..1735316 100644
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -27,7 +27,7 @@
         "PriorityDate": "${ipg_priority_datetime}",
         
         <#-- Segmentation keys inclusions -->
-        <#include "RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl">
+        <#include "RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl">,
         
         
         "LVBranchID": "${reflexMvtStockInterface.lv_code}"
diff --git a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
index 229a89b..1385a6e 100644
--- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
+++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
@@ -24,7 +24,7 @@
            </#if> 
          
            <#-- LV Metadata inclusion -->  
-         <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated_Metadata.ftl">
+         <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated_Metadata.ftl">,
          
           "IsBaseLogisticVariant": ${lv.base_lv},
         
diff --git a/RFXtoRP_HsaItmLv_LogisticVariantUpdated_Metadata.ftl b/RFXtoRP_HsaItmLv_LogisticVariantUpdated_Metadata.ftl
index e3dddf3..72f7aa3 100644
--- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated_Metadata.ftl
+++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated_Metadata.ftl
@@ -1,4 +1,4 @@
 <#-- use protobuf of class HsaItmLv to find Reflex Wms fields names  -->
 
 
-"MetaData": [        ],
\ No newline at end of file
+"MetaData": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl
index f338745..c6dd4ef 100644
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -22,7 +22,7 @@
         },
       
       <#-- Item metadata inclusion -->    
-    <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">
+    <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">,
       
     <#-- Item Photo URI could be added here -->
     <#--"PhotoURI": " ", -->
@@ -33,11 +33,11 @@
            
            <#list item.logistical_variant_list as logistical_variant>      
                { 
-              "LVID": "${logistical_variant.logistical_variant_code}",
+            "LVID": "${logistical_variant.logistical_variant_code}",
             "Name" : "${logistical_variant.lv_type_code}", 
               
               <#if logistical_variant.id_list??>  
-              "Codes": [
+            "Codes": [
                        <#list logistical_variant.id_list as id>
                        {
                           "Key":   "${id.logistical_variant_ID_type_code}",
@@ -47,10 +47,8 @@
                        ],  
               </#if>      
                
-               <#-- LV Metadata inclusion -->
-             <#if logistical_variant.additional_data_value_list??> 
-             <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">
-             </#if>               
+            <#-- LV Metadata inclusion -->
+            <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">,              
               
             "IsBaseLogisticVariant": ${logistical_variant.base_lv},
             
diff --git a/RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl b/RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl
index 566f271..881c81c 100644
--- a/RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl
@@ -1,5 +1,4 @@
-<#-- **** file included in RFXtoRP_HsaItm_ItemCreated.ftl  ***** -->
 <#-- use protobuf of class HsaItm to find Reflex Wms fields names  -->
 
 
-"MetaData": [        ],
\ No newline at end of file
+"MetaData": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl b/RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl
index c26c9f5..49607a6 100644
--- a/RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl
@@ -1,5 +1,4 @@
-<#-- **** file included in RFXtoRP_HsaItm_ItemCreated.ftl  ***** -->
 <#-- use protobuf of class HsaItm to find Reflex Wms fields names  -->
 
 
-"MetaData": [        ],
\ No newline at end of file
+"MetaData": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl
index 700cd05..55252cf 100644
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -15,7 +15,7 @@
       <#-- "PartnerID": "${}",  -->
     
     <#--
-    <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">
+    <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">,
     -->
     
       "Address": 
diff --git a/RFXtoRP_HsaSup_ActorCreated_Metadata.ftl b/RFXtoRP_HsaSup_ActorCreated_Metadata.ftl
index 82b66d8..770bf64 100644
--- a/RFXtoRP_HsaSup_ActorCreated_Metadata.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated_Metadata.ftl
@@ -1,5 +1,4 @@
-<#-- **** file included in RFXtoRP_HsaItm_ItemCreated.ftl  ***** -->
 <#-- use protobuf of class HsaSup to find Reflex WMS fields names  -->
 
 
-"MetaData": [        ],
\ No newline at end of file
+"MetaData": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl
index 6971aaa..9421a12 100644
--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@@ -15,7 +15,7 @@
       <#-- "PartnerID": "${}",  -->
     
     <#--
-    <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">
+    <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">,
     -->
     
       "Address": 
diff --git a/RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl b/RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl
index bf694c2..68c665e 100644
--- a/RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl
@@ -1,5 +1,4 @@
-<#-- **** file included in RFXtoRP_HsaItm_ItemCreated.ftl  ***** -->
 <#-- use protobuf of class HsrDepot to find Reflex WMS fields names  -->
 
 
-"MetaData": [        ],
\ No newline at end of file
+"MetaData": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index c983001..e38b479 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -20,7 +20,7 @@
            "AuthorTimeZone": "${time_zone_rfx}"            
              },   
             <#-- Header Metadata inclusion -->
-       <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">
+       <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">,
         
         "ShipFrom": { 
         "ActorID": "${order.physical_depot_code}"
@@ -65,7 +65,7 @@
                "LineID": "${line.preparation_order_line_number!0}",
                 </#if>
           <#-- Line Metadata inclusion -->
-          <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">
+          <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">,
           
              "RequestedContent": 
              {             
diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl
index 854f86d..125bbd5 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl
@@ -1,4 +1,3 @@
-<#-- **** file included in RFXtoRP_HsaItm_ItemCreated.ftl  ***** -->
 <#-- use protobuf of class HsrPro to find Reflex Wms fields names  -->
 
 <#-- 
@@ -12,4 +11,4 @@
 -->
 
 
-"MetaData": [        ],
\ No newline at end of file
+"MetaData": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl
index 1b3d04d..8dc79af 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl
@@ -1,5 +1,4 @@
-<#-- **** file included in RFXtoRP_HsaItm_ItemCreated.ftl  ***** -->
 <#-- use protobuf of class HsrPro to find Reflex Wms fields names  -->
 
 
-"MetaData": [        ],
\ No newline at end of file
+"MetaData": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index 2531f21..ba8c19c 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -21,7 +21,7 @@
              },   
    
        <#-- Header Metadata inclusion -->
-       <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">
+       <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
       
       "ShipFrom": 
       {
@@ -44,7 +44,7 @@
         {
           "LineID": "${line.receipt_line_number}",
           <#-- Line Metadata inclusion -->
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
           "RequestedContent": 
           {             
             "Goods": 
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl
index de365c0..301e1e2 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl
@@ -11,4 +11,4 @@
 -->
 
 
-"MetaData": [        ],
\ No newline at end of file
+"MetaData": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl
index 028dff1..de873ff 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl
@@ -1,4 +1,4 @@
 <#-- use protobuf of class HsrReceiptList to find Reflex Wms fields names  -->
 
 
-"MetaData": [        ],
\ No newline at end of file
+"MetaData": [        ]
\ No newline at end of file