diff --git a/ePICreator/templates/PackagedProductDefinition.fsh b/ePICreator/templates/PackagedProductDefinition.fsh
index aa4fd0fd6..d0ae944ca 100644
--- a/ePICreator/templates/PackagedProductDefinition.fsh
+++ b/ePICreator/templates/PackagedProductDefinition.fsh
@@ -38,8 +38,8 @@ Usage: #example
 
 
 * packaging
-  * identifier.system = $spor-prod
-  * identifier.value = "mock-id"
+//  * identifier.system = $spor-prod
+//  * identifier.value = "mock-id"
   * quantity = 1
   * type = $spor-rms#100000073498 "Box"
   * material = $spor-rms#200000003529 "Cardboard"
@@ -50,9 +50,12 @@ Usage: #example
 
     * identifier.system = $spor-prod
     * identifier.value = "{{ row["packaging_identifier"] }}"
+{% endif %}
+{%- if data["turn"] != "1" %}
+    * containedItem.item.reference = Reference({{data["references"]["ManufacturedItemDefinition"][0][0]}})
 {% endif %}
     * type = $spor-rms#{{ row["Packaging_typeID"] }} "{{ row["Packaging_type"] }}"
-    //* quantity = {{ row["packaging_quantity"] }}
+    
     {{ "* quantity = {}".format(row.packaging_quantity) if row.packaging_quantity|string !="nan"}}
     {{ "* material = $spor-rms#{} \"{}\"".format(row.packaging_materialID,row.packaging_material) if row.packaging_material|string !="nan"}}
 
diff --git a/input/fsh/examples/rawEPI/acmedrug-ema-automatic/MedicinalProductDefinition.fsh b/input/fsh/examples/rawEPI/acmedrug-ema-automatic/MedicinalProductDefinition.fsh
index 6ca0f1edd..f7ce12b81 100644
--- a/input/fsh/examples/rawEPI/acmedrug-ema-automatic/MedicinalProductDefinition.fsh
+++ b/input/fsh/examples/rawEPI/acmedrug-ema-automatic/MedicinalProductDefinition.fsh
@@ -28,23 +28,19 @@ Usage: #example
   
   * part[0]
     * part = "acme"
-    * type = $spor-productNamePartType-cs#220000000002
-    * type.text = "Invented name part"
+    * type = $spor-productNamePartType-cs#220000000002 "Invented name part"
   
   * part[+]
     * part = "acmedrug"
-    * type = $spor-productNamePartType-cs#220000000003
-    * type.text = "Scientific name part"
+    * type = $spor-productNamePartType-cs#220000000003 "Scientific name part"
   
   * part[+]
     * part = "75 mg"
-    * type = $spor-productNamePartType-cs#220000000004
-    * type.text = "Strength part"
+    * type = $spor-productNamePartType-cs#220000000004 "Strength part"
   
   * part[+]
     * part = "tablet"
-    * type = $spor-productNamePartType-cs#220000000005
-    * type.text = "Pharmaceutical dose form part"
+    * type = $spor-productNamePartType-cs#220000000005 "Pharmaceutical dose form part"
   
   * usage
     * country = urn:iso:std:iso:3166#DK "Denmark"
diff --git a/input/fsh/examples/rawEPI/biktarvy-ema-automatic/PackagedProductDefinition.fsh b/input/fsh/examples/rawEPI/biktarvy-ema-automatic/PackagedProductDefinition.fsh
index fa1774ace..b23d58b63 100644
--- a/input/fsh/examples/rawEPI/biktarvy-ema-automatic/PackagedProductDefinition.fsh
+++ b/input/fsh/examples/rawEPI/biktarvy-ema-automatic/PackagedProductDefinition.fsh
@@ -27,8 +27,8 @@ Usage: #example
 
 
 * packaging
-  * identifier.system = $spor-prod
-  * identifier.value = "mock-id"
+//  * identifier.system = $spor-prod
+//  * identifier.value = "mock-id"
   * quantity = 1
   * type = $spor-rms#100000073498 "Box"
   * material = $spor-rms#200000003529 "Cardboard"
@@ -37,8 +37,9 @@ Usage: #example
 
     * identifier.system = $spor-prod
     * identifier.value = "654321"
+    * containedItem.item.reference = Reference(mid-14ba4cb05b11f838919ef39edd3e0cdf)
     * type = $spor-rms#100000073504 "Child-resistant closure"
-    //* quantity = 1
+    
     * quantity = 1
     * material = $spor-rms#200000003529 "Cardboard"
 
@@ -84,8 +85,8 @@ Usage: #example
 
 
 * packaging
-  * identifier.system = $spor-prod
-  * identifier.value = "mock-id"
+//  * identifier.system = $spor-prod
+//  * identifier.value = "mock-id"
   * quantity = 1
   * type = $spor-rms#100000073498 "Box"
   * material = $spor-rms#200000003529 "Cardboard"
@@ -94,8 +95,9 @@ Usage: #example
 
     * identifier.system = $spor-prod
     * identifier.value = "654321"
+    * containedItem.item.reference = Reference(mid-14ba4cb05b11f838919ef39edd3e0cdf)
     * type = $spor-rms#100000073504 "Child-resistant closure"
-    //* quantity = 1
+    
     * quantity = 1
     * material = $spor-rms#200000003529 "Cardboard"