diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
index 3b07fc8..c5373d9 100644
--- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
@@ -20,24 +20,38 @@
         <#if despatched_ipg.carton_number != "000000000000000000"> 
            "ContainerType": "${despatched_ipg.carton_type_code}"
            <#if preparation_line.despatched_cartons_list?? >
-              <#list preparation_line.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg.carton_number) as dimension>
+              <#list preparation_line.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
               , 
               "Length": {
               "Unit": "${length_unit_rfx}",
-              "Value": "${dimension.overall_depth}"
+              "Value": "${dimensionCarton.overall_depth}"
               },
               "Weight": {
               "Unit": "${weight_unit_rfx}",
-              "Value": "${dimension.carton_gross_weight}"
+              "Value": "${dimensionCarton.carton_gross_weight}"
               },
               "Width": {
               "Unit": "${length_unit_rfx}",
-              "Value": "${dimension.overall_width}"
+              "Value": "${dimensionCarton.overall_width}"
               } 
               </#list>
             </#if> 
         <#else>
-           "ContainerType": "${despatched_ipg.hd_type_code}"
+           "ContainerType": "${despatched_ipg.hd_type_code}",
+           <#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.handling_device_number) as dimensionHU>
+            "Length": {
+              "Unit": "${length_unit_rfx}",
+              "Value": "${dimensionHU.hd_type_depth}"
+              },
+              "Weight": {
+              "Unit": "${weight_unit_rfx}",
+              "Value": "${dimensionHU.hd_gross_weight}"
+              },
+              "Width": {
+              "Unit": "${length_unit_rfx}",
+              "Value": "${dimensionHU.hd_type_width}"
+              } 
+              </#list>
         </#if>
       },