diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 35e9e7c2..9f3b4fb9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -52,11 +52,11 @@ jobs:
           JAVA_VALIDATION_ENABLED: true
           OUTPUT_FORMAT: RAW
           JAVA_VALIDATION_OPTIONS: -allow-example-urls true
-          JAVA_VALIDATOR_VERSION: 6.0.11
+          JAVA_VALIDATOR_VERSION: 6.3.15
           SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }}
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: true
-          SUSHI_VERSION: 3.5.0
+          SUSHI_VERSION: 3.11.0
           SUSHI_OPTIONS: Resources/
           EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
 
diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json
index 0747bafb..272186ed 100644
--- a/Resources/fsh-generated/fsh-index.json
+++ b/Resources/fsh-generated/fsh-index.json
@@ -493,7 +493,7 @@
     "fshType": "Extension",
     "fshFile": "extensions/GEM_ERP_EX_DeepLink.fsh",
     "startLine": 1,
-    "endLine": 7
+    "endLine": 8
   },
   {
     "outputFile": "StructureDefinition-GEM-ERP-EX-ExpiryDate.json",
@@ -541,7 +541,7 @@
     "fshType": "Extension",
     "fshFile": "extensions/GEM_ERP_EX_RedeemCode.fsh",
     "startLine": 1,
-    "endLine": 8
+    "endLine": 9
   },
   {
     "outputFile": "StructureDefinition-GEM-ERP-EX-SubstitutionAllowedType.json",
@@ -621,7 +621,7 @@
     "fshType": "Profile",
     "fshFile": "profiles/GEM_ERP_PR_Communication_InfoReq.fsh",
     "startLine": 1,
-    "endLine": 54
+    "endLine": 53
   },
   {
     "outputFile": "StructureDefinition-GEM-ERP-PR-Communication-Reply.json",
diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt
index dcfe7a90..d5f096ac 100644
--- a/Resources/fsh-generated/fsh-index.txt
+++ b/Resources/fsh-generated/fsh-index.txt
@@ -60,13 +60,13 @@ Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json
 StructureDefinition-GEM-ERP-EX-AcceptDate.json                                   GEM_ERP_EX_AcceptDate                                            Extension   extensions/GEM_ERP_EX_AcceptDate.fsh                    1 - 10
 StructureDefinition-GEM-ERP-EX-AvailabilityState.json                            GEM_ERP_EX_AvailabilityState                                     Extension   extensions/GEM_ERP_EX_AvailabilityState.fsh             1 - 10
 StructureDefinition-GEM-ERP-EX-Beneficiary.json                                  GEM_ERP_EX_Beneficiary                                           Extension   extensions/GEM_ERP_EX_Beneficiary.fsh                   1 - 8
-StructureDefinition-GEM-ERP-EX-DeepLink.json                                     GEM_ERP_EX_DeepLink                                              Extension   extensions/GEM_ERP_EX_DeepLink.fsh                      1 - 7
+StructureDefinition-GEM-ERP-EX-DeepLink.json                                     GEM_ERP_EX_DeepLink                                              Extension   extensions/GEM_ERP_EX_DeepLink.fsh                      1 - 8
 StructureDefinition-GEM-ERP-EX-ExpiryDate.json                                   GEM_ERP_EX_ExpiryDate                                            Extension   extensions/GEM_ERP_EX_ExpiryDate.fsh                    1 - 10
 StructureDefinition-GEM-ERP-EX-InsuranceProvider.json                            GEM_ERP_EX_InsuranceProvider                                     Extension   extensions/GEM_ERP_EX_InsuranceProvider.fsh             1 - 7
 StructureDefinition-GEM-ERP-EX-LastMedicationDispense.json                       GEM_ERP_EX_LastMedicationDispense                                Extension   extensions/GEM_ERP_EX_LastMedicationDispense.fsh        1 - 12
 StructureDefinition-GEM-ERP-EX-PackageQuantity.json                              GEM_ERP_EX_PackageQuantity                                       Extension   extensions/GEM_ERP_EX_PackageQuantity.fsh               1 - 8
 StructureDefinition-GEM-ERP-EX-PrescriptionType.json                             GEM_ERP_EX_PrescriptionType                                      Extension   extensions/GEM_ERP_EX_PrescriptionType.fsh              1 - 16
-StructureDefinition-GEM-ERP-EX-RedeemCode.json                                   GEM_ERP_EX_RedeemCode                                            Extension   extensions/GEM_ERP_EX_RedeemCode.fsh                    1 - 8
+StructureDefinition-GEM-ERP-EX-RedeemCode.json                                   GEM_ERP_EX_RedeemCode                                            Extension   extensions/GEM_ERP_EX_RedeemCode.fsh                    1 - 9
 StructureDefinition-GEM-ERP-EX-SubstitutionAllowedType.json                      GEM_ERP_EX_SubstitutionAllowedType                               Extension   extensions/GEM_ERP_EX_SubstitutionAllowedType.fsh       1 - 11
 StructureDefinition-GEM-ERP-EX-SupplyOptionsType.json                            GEM_ERP_EX_SupplyOptionsType                                     Extension   extensions/GEM_ERP_EX_SupplyOptionsType.fsh             1 - 26
 StructureDefinition-GEM-ERP-PR-AccessCode.json                                   GEM_ERP_PR_AccessCode                                            Profile     profiles/GEM_ERP_PR_AccessCode.fsh                      1 - 11
@@ -76,7 +76,7 @@ StructureDefinition-GEM-ERP-PR-Binary.json
 StructureDefinition-GEM-ERP-PR-Bundle-OP-Accept.json                             GEM_ERP_PR_Bundle_OP_Accept                                      Profile     profiles/GEM_ERP_PR_Bundle_OP_Accept.fsh                1 - 16
 StructureDefinition-GEM-ERP-PR-Bundle.json                                       GEM_ERP_PR_Bundle                                                Profile     profiles/GEM_ERP_PR_Bundle.fsh                          1 - 49
 StructureDefinition-GEM-ERP-PR-Communication-DispReq.json                        GEM_ERP_PR_Communication_DispReq                                 Profile     profiles/GEM_ERP_PR_Communication_DispReq.fsh           1 - 40
-StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json                        GEM_ERP_PR_Communication_InfoReq                                 Profile     profiles/GEM_ERP_PR_Communication_InfoReq.fsh           1 - 54
+StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json                        GEM_ERP_PR_Communication_InfoReq                                 Profile     profiles/GEM_ERP_PR_Communication_InfoReq.fsh           1 - 53
 StructureDefinition-GEM-ERP-PR-Communication-Reply.json                          GEM_ERP_PR_Communication_Reply                                   Profile     profiles/GEM_ERP_PR_Communication_Reply.fsh             1 - 51
 StructureDefinition-GEM-ERP-PR-Communication-Representative.json                 GEM_ERP_PR_Communication_Representative                          Profile     profiles/GEM_ERP_PR_Communication_Representative.fsh    1 - 34
 StructureDefinition-GEM-ERP-PR-Composition.json                                  GEM_ERP_PR_Composition                                           Profile     profiles/GEM_ERP_PR_Composition.fsh                     1 - 44
diff --git a/Resources/fsh-generated/resources/Bundle-Bundle-AcceptOperation.json b/Resources/fsh-generated/resources/Bundle-Bundle-AcceptOperation.json
index ae300226..277c50d4 100644
--- a/Resources/fsh-generated/resources/Bundle-Bundle-AcceptOperation.json
+++ b/Resources/fsh-generated/resources/Bundle-Bundle-AcceptOperation.json
@@ -57,6 +57,12 @@
             "value": "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
           }
         ],
+        "for": {
+          "identifier": {
+            "system": "http://fhir.de/sid/gkv/kvid-10",
+            "value": "X123456789"
+          }
+        },
         "input": [
           {
             "type": {
@@ -86,12 +92,6 @@
             ]
           }
         ],
-        "for": {
-          "identifier": {
-            "system": "http://fhir.de/sid/gkv/kvid-10",
-            "value": "X123456789"
-          }
-        },
         "lastModified": "2022-03-18T15:28:00+00:00"
       },
       "fullUrl": "https://erp-ref.zentral.erp.splitdns.ti-dienste.de/Task/d70932d1-9e1c-483c-b2d4-b7dced09b35e"
diff --git a/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json b/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json
index 91d6d46e..300bcaf3 100644
--- a/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json
+++ b/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json
@@ -98,7 +98,7 @@
           ]
         },
         "status": "active",
-        "serialNumber": "1.4.0",
+        "serialNumber": "1.14.0",
         "deviceName": [
           {
             "name": "E-Rezept-Fachdienst",
@@ -107,7 +107,7 @@
         ],
         "version": [
           {
-            "value": "1.4.0"
+            "value": "1.14.0"
           }
         ],
         "contact": [
diff --git a/Resources/fsh-generated/resources/Communication-2be1c6ac-5d10-47f6-84ee-8318b2c22c76.json b/Resources/fsh-generated/resources/Communication-2be1c6ac-5d10-47f6-84ee-8318b2c22c76.json
index b1b75f14..0283dda3 100644
--- a/Resources/fsh-generated/resources/Communication-2be1c6ac-5d10-47f6-84ee-8318b2c22c76.json
+++ b/Resources/fsh-generated/resources/Communication-2be1c6ac-5d10-47f6-84ee-8318b2c22c76.json
@@ -30,16 +30,16 @@
       }
     }
   ],
-  "basedOn": [
-    {
-      "reference": "Task/162.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
-    }
-  ],
   "sender": {
     "identifier": {
       "system": "http://fhir.de/sid/gkv/kvid-10",
       "value": "X234567890"
     }
   },
+  "basedOn": [
+    {
+      "reference": "Task/162.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
+    }
+  ],
   "sent": "2020-04-29T13:44:30.128+02:00"
 }
diff --git a/Resources/fsh-generated/resources/Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json b/Resources/fsh-generated/resources/Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json
index 354f222b..d418df30 100644
--- a/Resources/fsh-generated/resources/Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json
+++ b/Resources/fsh-generated/resources/Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json
@@ -12,6 +12,14 @@
     ]
   },
   "status": "unknown",
+  "recipient": [
+    {
+      "identifier": {
+        "system": "http://fhir.de/sid/gkv/kvid-10",
+        "value": "X234567890"
+      }
+    }
+  ],
   "payload": [
     {
       "extension": [
@@ -54,13 +62,5 @@
       "value": "3-SMC-B-Testkarte-883110000123465"
     }
   },
-  "recipient": [
-    {
-      "identifier": {
-        "system": "http://fhir.de/sid/gkv/kvid-10",
-        "value": "X234567890"
-      }
-    }
-  ],
   "sent": "2020-04-29T13:46:30.128+02:00"
 }
diff --git a/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json b/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json
index 6bf39215..dc3c352e 100644
--- a/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json
+++ b/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json
@@ -69,6 +69,12 @@
       "contentString": "U.N.V.E.U."
     }
   ],
+  "sender": {
+    "identifier": {
+      "system": "http://fhir.de/sid/gkv/kvid-10",
+      "value": "X234567890"
+    }
+  },
   "contained": [
     {
       "resourceType": "Medication",
@@ -139,11 +145,5 @@
       "reference": "#SumatripanMedication"
     }
   ],
-  "sender": {
-    "identifier": {
-      "system": "http://fhir.de/sid/gkv/kvid-10",
-      "value": "X234567890"
-    }
-  },
   "sent": "2020-04-29T13:43:30.128+02:00"
 }
diff --git a/Resources/fsh-generated/resources/Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json b/Resources/fsh-generated/resources/Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json
index ceb16e2e..6a7b8485 100644
--- a/Resources/fsh-generated/resources/Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json
+++ b/Resources/fsh-generated/resources/Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json
@@ -30,17 +30,17 @@
       }
     }
   ],
-  "basedOn": [
-    {
-      "reference": "Task/160.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
-    }
-  ],
   "sender": {
     "identifier": {
       "system": "http://fhir.de/sid/gkv/kvid-10",
       "value": "X234567890"
     }
   },
+  "basedOn": [
+    {
+      "reference": "Task/160.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
+    }
+  ],
   "sent": "2020-04-29T13:44:30.128+02:00",
   "payload": [
     {
diff --git a/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json b/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json
index c5cfefa7..473a54a9 100644
--- a/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json
+++ b/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json
@@ -13,6 +13,13 @@
     }
   ],
   "status": "completed",
+  "medicationReference": {
+    "identifier": {
+      "system": "http://fhir.de/CodeSystem/ifa/pzn",
+      "value": "12345678"
+    },
+    "display": "Gematico Diabetestherapie"
+  },
   "subject": {
     "identifier": {
       "system": "http://fhir.de/sid/gkv/kvid-10",
@@ -31,20 +38,13 @@
   ],
   "extension": [
     {
-      "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode",
+      "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode",
       "valueString": "DE12345678901234"
     },
     {
-      "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-DeepLink",
+      "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_DeepLink",
       "valueUrl": "https://gematico.de?redeemCode=DE12345678901234"
     }
   ],
-  "whenHandedOver": "2024-04-03",
-  "medicationReference": {
-    "display": "Gematico Diabetestherapie",
-    "identifier": {
-      "system": "https://example.de/fhir/identifier-for-diga",
-      "value": "12345678"
-    }
-  }
+  "whenHandedOver": "2024-04-03"
 }
diff --git a/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json b/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json
index 7dfd6c8f..c49b8bb6 100644
--- a/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json
+++ b/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json
@@ -13,6 +13,13 @@
     }
   ],
   "status": "completed",
+  "medicationReference": {
+    "identifier": {
+      "system": "http://fhir.de/CodeSystem/ifa/pzn",
+      "value": "12345678"
+    },
+    "display": "Gematico Diabetestherapie"
+  },
   "subject": {
     "identifier": {
       "system": "http://fhir.de/sid/gkv/kvid-10",
@@ -31,16 +38,9 @@
   ],
   "extension": [
     {
-      "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode",
+      "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode",
       "valueString": "DE12345678901234"
     }
   ],
-  "whenHandedOver": "2024-04-03",
-  "medicationReference": {
-    "display": "Gematico Diabetestherapie",
-    "identifier": {
-      "system": "https://example.de/fhir/identifier-for-diga",
-      "value": "12345678"
-    }
-  }
+  "whenHandedOver": "2024-04-03"
 }
diff --git a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersDiGA.json b/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersDiGA.json
index b6783215..817740fa 100644
--- a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersDiGA.json
+++ b/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersDiGA.json
@@ -27,6 +27,13 @@
               }
             ],
             "status": "completed",
+            "medicationReference": {
+              "identifier": {
+                "system": "http://fhir.de/CodeSystem/ifa/pzn",
+                "value": "12345678"
+              },
+              "display": "Gematico Diabetestherapie"
+            },
             "subject": {
               "identifier": {
                 "system": "http://fhir.de/sid/gkv/kvid-10",
@@ -45,18 +52,11 @@
             ],
             "extension": [
               {
-                "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode",
+                "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode",
                 "valueString": "DE12345678901234"
               }
             ],
-            "whenHandedOver": "2024-04-03",
-            "medicationReference": {
-              "display": "Gematico Diabetestherapie",
-              "identifier": {
-                "system": "https://example.de/fhir/identifier-for-diga",
-                "value": "12345678"
-              }
-            }
+            "whenHandedOver": "2024-04-03"
           }
         }
       ]
diff --git a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json b/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json
index 4038d5c3..7149cd6e 100644
--- a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json
+++ b/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json
@@ -7,6 +7,112 @@
     ]
   },
   "parameter": [
+    {
+      "name": "rxDispensation",
+      "part": [
+        {
+          "name": "medicationDispense",
+          "resource": {
+            "resourceType": "MedicationDispense",
+            "id": "Example-MedicationDispense",
+            "meta": {
+              "profile": [
+                "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense|1.4"
+              ]
+            },
+            "identifier": [
+              {
+                "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
+                "value": "160.000.033.491.280.78"
+              }
+            ],
+            "status": "completed",
+            "subject": {
+              "identifier": {
+                "system": "http://fhir.de/sid/gkv/kvid-10",
+                "value": "X123456789"
+              }
+            },
+            "performer": [
+              {
+                "actor": {
+                  "identifier": {
+                    "system": "https://gematik.de/fhir/sid/telematik-id",
+                    "value": "3-SMC-B-Testkarte-883110000095957"
+                  }
+                }
+              }
+            ],
+            "whenHandedOver": "2024-04-03",
+            "whenPrepared": "2024-04-03",
+            "medicationReference": {
+              "reference": "Medication/SumatripanMedication"
+            }
+          }
+        },
+        {
+          "name": "medication",
+          "resource": {
+            "resourceType": "Medication",
+            "id": "SumatripanMedication",
+            "meta": {
+              "profile": [
+                "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Medication|1.4"
+              ]
+            },
+            "extension": [
+              {
+                "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/drug-category-extension",
+                "valueCoding": {
+                  "code": "00",
+                  "system": "https://gematik.de/fhir/epa-medication/CodeSystem/epa-drug-category-cs"
+                }
+              },
+              {
+                "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-id-vaccine-extension",
+                "valueBoolean": false
+              },
+              {
+                "url": "http://fhir.de/StructureDefinition/normgroesse",
+                "valueCode": "N1"
+              }
+            ],
+            "code": {
+              "coding": [
+                {
+                  "system": "http://fhir.de/CodeSystem/ifa/pzn",
+                  "code": "06313728"
+                }
+              ],
+              "text": "Sumatriptan-1a Pharma 100 mg Tabletten"
+            },
+            "form": {
+              "coding": [
+                {
+                  "system": "https://fhir.kbv.de/CodeSystem/KBV_CS_SFHIR_KBV_DARREICHUNGSFORM",
+                  "code": "TAB"
+                }
+              ]
+            },
+            "amount": {
+              "numerator": {
+                "extension": [
+                  {
+                    "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-total-quantity-formulation-extension",
+                    "valueString": "20 St."
+                  }
+                ],
+                "value": 20,
+                "unit": "St"
+              },
+              "denominator": {
+                "value": 1
+              }
+            }
+          }
+        }
+      ]
+    },
     {
       "name": "rxDispensation",
       "part": [
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-DeepLink.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-DeepLink.json
index 3aa7e39e..13f71a1b 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-DeepLink.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-DeepLink.json
@@ -1,11 +1,12 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERP-EX-DeepLink",
-  "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-DeepLink",
-  "version": "1.4.0",
+  "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_DeepLink",
+  "version": "1.4",
   "name": "GEM_ERP_EX_DeepLink",
   "title": "DiGA-DeepLink",
-  "status": "draft",
+  "status": "active",
+  "date": "2024-07-15",
   "description": "Contains information regarding deep link for a DiGA.",
   "fhirVersion": "4.0.1",
   "kind": "complex-type",
@@ -34,7 +35,7 @@
       {
         "id": "Extension.url",
         "path": "Extension.url",
-        "fixedUri": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-DeepLink"
+        "fixedUri": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_DeepLink"
       },
       {
         "id": "Extension.value[x]",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-RedeemCode.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-RedeemCode.json
index 10be0a79..e407c4ab 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-RedeemCode.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-RedeemCode.json
@@ -1,11 +1,12 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERP-EX-RedeemCode",
-  "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode",
-  "version": "1.4.0",
+  "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode",
+  "version": "1.4",
   "name": "GEM_ERP_EX_RedeemCode",
   "title": "DiGA-RedeemCode",
-  "status": "draft",
+  "status": "active",
+  "date": "2024-07-15",
   "description": "States the redeem code for a DiGA.",
   "fhirVersion": "4.0.1",
   "kind": "complex-type",
@@ -29,7 +30,7 @@
       {
         "id": "Extension.url",
         "path": "Extension.url",
-        "fixedUri": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode"
+        "fixedUri": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode"
       },
       {
         "id": "Extension.value[x]",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json
index f6605d75..9452dd98 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json
@@ -78,8 +78,7 @@
             "code": "Identifier",
             "profile": [
               "http://fhir.de/StructureDefinition/identifier-telematik-id",
-              "http://fhir.de/StructureDefinition/identifier-kvid-10",
-              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10"
+              "http://fhir.de/StructureDefinition/identifier-kvid-10"
             ]
           }
         ]
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json
index 8abaf072..f18d3437 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json
@@ -144,8 +144,7 @@
           {
             "code": "Identifier",
             "profile": [
-              "http://fhir.de/StructureDefinition/identifier-kvid-10",
-              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10"
+              "http://fhir.de/StructureDefinition/identifier-kvid-10"
             ]
           }
         ],
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json
index fb2bc1b1..44d36343 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json
@@ -63,7 +63,6 @@
       {
         "id": "Communication.about",
         "path": "Communication.about",
-        "min": 1,
         "type": [
           {
             "code": "Reference",
@@ -132,8 +131,7 @@
           {
             "code": "Identifier",
             "profile": [
-              "http://fhir.de/StructureDefinition/identifier-kvid-10",
-              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10"
+              "http://fhir.de/StructureDefinition/identifier-kvid-10"
             ]
           }
         ]
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json
index 78b61a2f..786c4df0 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json
@@ -90,8 +90,7 @@
           {
             "code": "Identifier",
             "profile": [
-              "http://fhir.de/StructureDefinition/identifier-kvid-10",
-              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10"
+              "http://fhir.de/StructureDefinition/identifier-kvid-10"
             ]
           }
         ]
@@ -113,7 +112,6 @@
             "code": "Identifier",
             "profile": [
               "http://fhir.de/StructureDefinition/identifier-kvid-10",
-              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10",
               "http://fhir.de/StructureDefinition/identifier-telematik-id"
             ]
           }
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json
index ed1ef13e..46c069c4 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json
@@ -93,8 +93,7 @@
           {
             "code": "Identifier",
             "profile": [
-              "http://fhir.de/StructureDefinition/identifier-kvid-10",
-              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10"
+              "http://fhir.de/StructureDefinition/identifier-kvid-10"
             ]
           }
         ],
@@ -116,8 +115,7 @@
           {
             "code": "Identifier",
             "profile": [
-              "http://fhir.de/StructureDefinition/identifier-kvid-10",
-              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10"
+              "http://fhir.de/StructureDefinition/identifier-kvid-10"
             ]
           }
         ],
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json
index c316c804..0864fe6e 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json
@@ -24,21 +24,21 @@
             "key": "workflow-medicationdispense-redeemcode-1",
             "severity": "error",
             "human": "A note was not found, but is mandatory if no redeem code is provided.",
-            "expression": "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode').empty() implies note.exists()",
+            "expression": "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').empty() implies note.exists()",
             "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense_DiGA"
           },
           {
             "key": "workflow-medicationdispense-redeemcode-2",
             "severity": "error",
             "human": "The data absent reason was not found, but is mandatory if no redeem code is provided.",
-            "expression": "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode').empty() implies medicationReference.extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists()",
+            "expression": "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').empty() implies medicationReference.extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists()",
             "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense_DiGA"
           },
           {
             "key": "workflow-medicationdispense-redeemcode-3",
             "severity": "error",
             "human": "Name and identifier of the DiGA was not found, but is mandatory if a redeem code is provided.",
-            "expression": "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode').exists() implies (medicationReference.display.exists() and medicationReference.identifier.exists())",
+            "expression": "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').exists() implies (medicationReference.display.exists() and medicationReference.identifier.exists())",
             "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense_DiGA"
           }
         ]
@@ -65,7 +65,7 @@
           {
             "code": "Extension",
             "profile": [
-              "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode"
+              "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode"
             ]
           }
         ]
@@ -80,7 +80,7 @@
           {
             "code": "Extension",
             "profile": [
-              "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-DeepLink"
+              "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_DeepLink"
             ]
           }
         ]
@@ -118,7 +118,7 @@
       {
         "id": "MedicationDispense.medication[x]",
         "path": "MedicationDispense.medication[x]",
-        "definition": "Information about the medication that is being dispensed. To include are name and the identifier of a DiGA prescription unit."
+        "definition": "Information about the medication that is being dispensed. To include are name and the PZN-identifier of a DiGA prescription unit."
       },
       {
         "id": "MedicationDispense.medication[x].extension:data-absent-reason",
@@ -149,11 +149,13 @@
         "id": "MedicationDispense.medication[x].identifier.system",
         "path": "MedicationDispense.medication[x].identifier.system",
         "min": 1,
+        "fixedUri": "http://fhir.de/CodeSystem/ifa/pzn",
         "mustSupport": true
       },
       {
         "id": "MedicationDispense.medication[x].identifier.value",
         "path": "MedicationDispense.medication[x].identifier.value",
+        "short": "Unique identification number for a prescription unit of a DiGA (PZN).",
         "min": 1,
         "mustSupport": true
       },
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json
index 85c4f9a6..3b64e19e 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json
@@ -191,8 +191,7 @@
           {
             "code": "Identifier",
             "profile": [
-              "http://fhir.de/StructureDefinition/identifier-kvid-10",
-              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10"
+              "http://fhir.de/StructureDefinition/identifier-kvid-10"
             ]
           }
         ]
diff --git a/Resources/fsh-generated/resources/Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json b/Resources/fsh-generated/resources/Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json
index e714e8d2..e54d19c0 100644
--- a/Resources/fsh-generated/resources/Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json
+++ b/Resources/fsh-generated/resources/Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json
@@ -40,6 +40,12 @@
       "value": "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
     }
   ],
+  "for": {
+    "identifier": {
+      "system": "http://fhir.de/sid/gkv/kvid-10",
+      "value": "X123456789"
+    }
+  },
   "input": [
     {
       "type": {
@@ -99,11 +105,5 @@
       ]
     }
   ],
-  "for": {
-    "identifier": {
-      "system": "http://fhir.de/sid/gkv/kvid-10",
-      "value": "X123456789"
-    }
-  },
   "lastModified": "2022-03-18T15:29:00+00:00"
 }
diff --git a/Resources/fsh-generated/resources/Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json b/Resources/fsh-generated/resources/Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json
index 7cf47a81..c6f7250c 100644
--- a/Resources/fsh-generated/resources/Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json
+++ b/Resources/fsh-generated/resources/Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json
@@ -40,6 +40,12 @@
       "value": "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
     }
   ],
+  "for": {
+    "identifier": {
+      "system": "http://fhir.de/sid/gkv/kvid-10",
+      "value": "X123456789"
+    }
+  },
   "input": [
     {
       "type": {
@@ -83,11 +89,5 @@
       ]
     }
   ],
-  "for": {
-    "identifier": {
-      "system": "http://fhir.de/sid/gkv/kvid-10",
-      "value": "X123456789"
-    }
-  },
   "lastModified": "2022-03-18T15:27:00+00:00"
 }
diff --git a/Resources/fsh-generated/resources/Task-9b48f82c-9c11-4a57-aa72-a805f9537a82.json b/Resources/fsh-generated/resources/Task-9b48f82c-9c11-4a57-aa72-a805f9537a82.json
index e848ef07..ba0c6162 100644
--- a/Resources/fsh-generated/resources/Task-9b48f82c-9c11-4a57-aa72-a805f9537a82.json
+++ b/Resources/fsh-generated/resources/Task-9b48f82c-9c11-4a57-aa72-a805f9537a82.json
@@ -44,6 +44,12 @@
       "value": "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
     }
   ],
+  "for": {
+    "identifier": {
+      "system": "http://fhir.de/sid/gkv/kvid-10",
+      "value": "X123456789"
+    }
+  },
   "input": [
     {
       "type": {
@@ -87,11 +93,5 @@
       ]
     }
   ],
-  "for": {
-    "identifier": {
-      "system": "http://fhir.de/sid/gkv/kvid-10",
-      "value": "X123456789"
-    }
-  },
   "lastModified": "2022-03-18T15:28:00+00:00"
 }
diff --git a/Resources/fsh-generated/resources/Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json b/Resources/fsh-generated/resources/Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json
index 99a1a069..687c4b2f 100644
--- a/Resources/fsh-generated/resources/Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json
+++ b/Resources/fsh-generated/resources/Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json
@@ -40,6 +40,12 @@
       "value": "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
     }
   ],
+  "for": {
+    "identifier": {
+      "system": "http://fhir.de/sid/gkv/kvid-10",
+      "value": "X123456789"
+    }
+  },
   "input": [
     {
       "type": {
@@ -69,11 +75,5 @@
       ]
     }
   ],
-  "for": {
-    "identifier": {
-      "system": "http://fhir.de/sid/gkv/kvid-10",
-      "value": "X123456789"
-    }
-  },
   "lastModified": "2022-03-18T15:28:00+00:00"
 }
diff --git a/Resources/fsh-generated/resources/Task-f5c21409-b84b-4125-8649-5630a00906b1.json b/Resources/fsh-generated/resources/Task-f5c21409-b84b-4125-8649-5630a00906b1.json
index 4e6a675e..5df8e3ad 100644
--- a/Resources/fsh-generated/resources/Task-f5c21409-b84b-4125-8649-5630a00906b1.json
+++ b/Resources/fsh-generated/resources/Task-f5c21409-b84b-4125-8649-5630a00906b1.json
@@ -44,6 +44,12 @@
       "value": "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
     }
   ],
+  "for": {
+    "identifier": {
+      "system": "http://fhir.de/sid/gkv/kvid-10",
+      "value": "X123456789"
+    }
+  },
   "input": [
     {
       "type": {
@@ -87,11 +93,5 @@
       ]
     }
   ],
-  "for": {
-    "identifier": {
-      "system": "http://fhir.de/sid/gkv/kvid-10",
-      "value": "X123456789"
-    }
-  },
   "lastModified": "2022-03-18T15:28:00+00:00"
 }
diff --git a/Resources/input/fsh/aliases.fsh b/Resources/input/fsh/aliases.fsh
index 94ca1e77..5e9a765e 100644
--- a/Resources/input/fsh/aliases.fsh
+++ b/Resources/input/fsh/aliases.fsh
@@ -14,8 +14,7 @@ Alias: $KBV_EX_Base_Medication_Type = https://fhir.kbv.de/StructureDefinition/KB
 Alias: $KBV_EX_ERP_Medication_Normgroesse = http://fhir.de/StructureDefinition/normgroesse
 
 // DE-Basisprofile
-Alias: $identifier-kvid-10 = http://fhir.de/StructureDefinition/identifier-kvid-10
-Alias: $identifier-pkv = https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10
+Alias: $identifier-kvid-10 = http://fhir.de/sid/gkv/kvid-10
 Alias: $identifier-telematik-id = https://gematik.de/fhir/sid/telematik-id
 Alias: $identifier-iknr = http://fhir.de/StructureDefinition/identifier-iknr
 
@@ -24,7 +23,8 @@ Alias: $cs-atc-de = http://fhir.de/CodeSystem/bfarm/atc
 Alias: $cs-product-key = https://terminologieserver.bfarm.de/fhir/CodeSystem/arzneimittel-referenzdaten-pharmazeutisches-produkt
 
 // Codings
-Alias: $pzn = http://fhir.de/CodeSystem/ifa/pzn
+Alias: $cs-pzn = http://fhir.de/CodeSystem/ifa/pzn
+
 // ePA Medication
 Alias: $ePAMedicationDispense = https://gematik.de/fhir/epa-medication/StructureDefinition/epa-medication-dispense
 Alias: $ePAMedication = https://gematik.de/fhir/epa-medication/StructureDefinition/epa-medication
diff --git a/Resources/input/fsh/examples/Example_Communication_DispReq.fsh b/Resources/input/fsh/examples/Example_Communication_DispReq.fsh
index 443336f9..a47c5f74 100644
--- a/Resources/input/fsh/examples/Example_Communication_DispReq.fsh
+++ b/Resources/input/fsh/examples/Example_Communication_DispReq.fsh
@@ -12,7 +12,7 @@ Usage: #example
 * status = #unknown
 * recipient[+].identifier.system = $identifier-telematik-id
 * recipient[=].identifier.value = "3-SMC-B-Testkarte-883110000123465"
-* sender.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* sender.identifier.system = $identifier-kvid-10
 * sender.identifier.value = "X234567890"
 * sent = "2020-04-29T13:44:30.128+02:00"
 * payload.contentString = "{ \"version\": \"1\", \"supplyOptionsType\": \"delivery\", \"name\": \"Dr. Maximilian von Muster\", \"address\": [ \"wohnhaft bei Emilia Fischer\", \"Bundesallee 312\", \"123. OG\", \"12345 Berlin\" ], \"hint\": \"Bitte im Morsecode klingeln: -.-.\", \"phone\": \"004916094858168\" }"
@@ -30,7 +30,7 @@ Usage: #example
 * status = #unknown
 * recipient[+].identifier.system = $identifier-telematik-id
 * recipient[=].identifier.value = "8-SMC-B-Testkarte-883110000123465"
-* sender.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* sender.identifier.system = $identifier-kvid-10
 * sender.identifier.value = "X234567890"
 * sent = "2020-04-29T13:44:30.128+02:00"
 
@@ -47,7 +47,7 @@ Usage: #example
 * status = #unknown
 * recipient[+].identifier.system = $identifier-telematik-id
 * recipient[=].identifier.value = "8-SMC-B-Testkarte-883110000123465"
-* sender.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* sender.identifier.system = $identifier-kvid-10
 * sender.identifier.value = "X234567890"
 * sent = "2020-04-29T13:44:30.128+02:00"
 * payload.contentString = "U.N.V.E.U"
@@ -64,7 +64,7 @@ Usage: #example
 * status = #unknown
 * recipient[+].identifier.system = $identifier-telematik-id
 * recipient[=].identifier.value = "3-SMC-B-Testkarte-883110000123465"
-* sender.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* sender.identifier.system = $identifier-kvid-10
 * sender.identifier.value = "X234567890"
 * sent = "2020-04-29T13:44:30.128+02:00"
 */
\ No newline at end of file
diff --git a/Resources/input/fsh/examples/Example_Communication_InfoReq.fsh b/Resources/input/fsh/examples/Example_Communication_InfoReq.fsh
index 32ee42b2..95a65a22 100644
--- a/Resources/input/fsh/examples/Example_Communication_InfoReq.fsh
+++ b/Resources/input/fsh/examples/Example_Communication_InfoReq.fsh
@@ -11,7 +11,7 @@ Usage: #example
 * about = Reference(SumatripanMedication)
 * recipient[+].identifier.system = $identifier-telematik-id
 * recipient[=].identifier.value = "3-SMC-B-Testkarte-883110000123465"
-* sender.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* sender.identifier.system = $identifier-kvid-10
 * sender.identifier.value = "X234567890"
 * sent = "2020-04-29T13:43:30.128+02:00"
 * payload.extension[InsuranceProvider].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_InsuranceProvider"
diff --git a/Resources/input/fsh/examples/Example_Communication_Reply.fsh b/Resources/input/fsh/examples/Example_Communication_Reply.fsh
index b2da233a..1a3ec8b1 100644
--- a/Resources/input/fsh/examples/Example_Communication_Reply.fsh
+++ b/Resources/input/fsh/examples/Example_Communication_Reply.fsh
@@ -10,7 +10,7 @@ Usage: #example
 * status = #unknown
 * sender.identifier.system = $identifier-telematik-id
 * sender.identifier.value = "3-SMC-B-Testkarte-883110000123465"
-* recipient[+].identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* recipient[+].identifier.system = $identifier-kvid-10
 * recipient[=].identifier.value = "X234567890"
 * sent = "2020-04-29T13:46:30.128+02:00"
 * payload.extension[AvailabilityStatus].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_AvailabilityState"
diff --git a/Resources/input/fsh/examples/Example_Device.fsh b/Resources/input/fsh/examples/Example_Device.fsh
index d69b9d09..08703508 100644
--- a/Resources/input/fsh/examples/Example_Device.fsh
+++ b/Resources/input/fsh/examples/Example_Device.fsh
@@ -5,9 +5,9 @@ Usage: #inline
 * id = "1"
 * insert PackageMetaProfile(StructureDefinition/GEM_ERP_PR_Device)
 * status = #active
-* serialNumber = "1.4.0"
+* serialNumber = "1.14.0"
 * deviceName.name = "E-Rezept-Fachdienst"
 * deviceName.type = #user-friendly-name
-* version.value = "1.4.0"
+* version.value = "1.14.0"
 * contact.system = #email
 * contact.value = "betrieb@gematik.de"
diff --git a/Resources/input/fsh/examples/Example_MedicationDispense.fsh b/Resources/input/fsh/examples/Example_MedicationDispense.fsh
index 9e2a8bec..60498f86 100644
--- a/Resources/input/fsh/examples/Example_MedicationDispense.fsh
+++ b/Resources/input/fsh/examples/Example_MedicationDispense.fsh
@@ -6,7 +6,7 @@ Title: "Example Medication Dispense"
 Description: "Example of a Medication Dispense."
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "160.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
@@ -21,7 +21,7 @@ Title: "Example another Medication Dispense"
 Description: "Example of another Medication Dispense."
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "160.153.303.257.459"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
@@ -36,7 +36,7 @@ Title: "Example Kombipackung Medication Dispense"
 Description: "Example of a Kombipackung Medication Dispense."
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "160.153.303.257.459"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
@@ -51,7 +51,7 @@ Title: "Example Rezeptur Medication Dispense"
 Description: "Example of a Rezeptur Medication Dispense."
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "160.153.303.257.459"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
@@ -68,7 +68,7 @@ Title: "Example-Medication Dispense"
 Description: "Example of a Medication Dispense."
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "160.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
@@ -84,7 +84,7 @@ Title: "Example-Medication Dispense"
 Description: "Example of a Medication Dispense."
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "160.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
@@ -100,7 +100,7 @@ Title: "Example-Medication Dispense"
 Description: "Example of a Medication Dispense."
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "160.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "1-SMC-B-Testkarte-883110000095957"
@@ -116,7 +116,7 @@ Title: "Example-Medication Dispense"
 Description: "Example of a Medication Dispense."
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "160.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
diff --git a/Resources/input/fsh/examples/Example_MedicationDispense_DiGA.fsh b/Resources/input/fsh/examples/Example_MedicationDispense_DiGA.fsh
index 173463e0..563af9a2 100644
--- a/Resources/input/fsh/examples/Example_MedicationDispense_DiGA.fsh
+++ b/Resources/input/fsh/examples/Example_MedicationDispense_DiGA.fsh
@@ -6,13 +6,13 @@ Description: "Example of a Medication Dispense for DiGAs only stating the name o
 * extension[redeemCode].valueString = "DE12345678901234"
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "162.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "8-SMC-B-Testkarte-883110000095957"
 * whenHandedOver = "2024-04-03"
 * medicationReference.display = "Gematico Diabetestherapie"
-* medicationReference.identifier.system = "https://example.de/fhir/identifier-for-diga" //TODO: Set correct system
+* medicationReference.identifier.system = $cs-pzn
 * medicationReference.identifier.value = "12345678"
 
 Instance: Example-MedicationDispense-DiGA-DeepLink
@@ -24,13 +24,13 @@ Description: "Example of a Medication Dispense for DiGAs which states a deep lin
 * extension[deepLink].valueUrl = "https://gematico.de?redeemCode=DE12345678901234"
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "162.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "8-SMC-B-Testkarte-883110000095957"
 * whenHandedOver = "2024-04-03"
 * medicationReference.display = "Gematico Diabetestherapie"
-* medicationReference.identifier.system = "https://example.de/fhir/identifier-for-diga" //TODO: Set correct system
+* medicationReference.identifier.system = $cs-pzn
 * medicationReference.identifier.value = "12345678"
 
 Instance: Example-MedicationDispense-DiGA-NoRedeemCode
@@ -40,7 +40,7 @@ Title: "Medication Dispense DiGA without a redeem code"
 Description: "Example of a Medication Dispense for DiGAs which has no redeem code."
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "162.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "8-SMC-B-Testkarte-883110000095957"
@@ -57,7 +57,7 @@ Description: "Example of a Medication Dispense for DiGAs only stating the name o
 * extension[redeemCode].valueString = "DE12345678901234"
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "162.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "8-SMC-B-Testkarte-883110000095957"
@@ -71,7 +71,7 @@ Title: "Invalid MedicationDispense for missing Note"
 Description: "A Note needs to be provided if no redeem code is provided."
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "162.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "8-SMC-B-Testkarte-883110000095957"
@@ -85,7 +85,7 @@ Title: "Invalid MedicationDispense for missing DataAbsentReason"
 Description: "A DataAbsentReason needs to be provided if no redeem code is provided."
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "162.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "8-SMC-B-Testkarte-883110000095957"
@@ -101,12 +101,12 @@ Description: "When a redeem code is provided, the name of the DiGA is mandatory.
 * extension[redeemCode].valueString = "DE12345678901234"
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "162.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "8-SMC-B-Testkarte-883110000095957"
 * whenHandedOver = "2024-04-03"
-* medicationReference.identifier.system = $pzn //TODO: Set correct system
+* medicationReference.identifier.system = $cs-pzn
 * medicationReference.identifier.value = "12345678"
 
 Instance: INVALID-Example-MedicationDispense-Missing-DiGA-PZN
@@ -117,7 +117,7 @@ Description: "When a redeem code is provided, the DiGA-PZN is mandatory."
 * extension[redeemCode].valueString = "DE12345678901234"
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "162.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "8-SMC-B-Testkarte-883110000095957"
@@ -132,7 +132,7 @@ Description: "When a redeem code is provided, the Name and DiGA-PZN are mandator
 * extension[redeemCode].valueString = "DE12345678901234"
 * identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
 * identifier[prescriptionID].value = "162.000.033.491.280.78"
-* subject.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* subject.identifier.system = $identifier-kvid-10
 * subject.identifier.value = "X123456789"
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "8-SMC-B-Testkarte-883110000095957"
diff --git a/Resources/input/fsh/examples/Example_Medication_Kombipackung.fsh b/Resources/input/fsh/examples/Example_Medication_Kombipackung.fsh
index 262b1e33..c18623a8 100644
--- a/Resources/input/fsh/examples/Example_Medication_Kombipackung.fsh
+++ b/Resources/input/fsh/examples/Example_Medication_Kombipackung.fsh
@@ -9,7 +9,7 @@ Usage: #example
 * extension[isVaccine].valueBoolean = false
 * extension[drugCategory].valueCoding = EPADrugCategoryCS#00
 * extension[drugCategory].valueCoding.display = "Arzneimittel oder in die Arzneimittelversorgung nach § 31 SGB V einbezogenes Produkt"
-* code.coding[pzn] = $pzn#1746517 "CROMO-RATIOPHARM Kombipackung"
+* code.coding[pzn] = $cs-pzn#1746517 "CROMO-RATIOPHARM Kombipackung"
 * status = #active
 * form.coding[kbvDarreichungsform].code = #KPG
 * form.text = "Kombipackung"
diff --git a/Resources/input/fsh/examples/Example_Operation_Close.fsh b/Resources/input/fsh/examples/Example_Operation_Close.fsh
index 4e4e4748..650e1ce7 100644
--- a/Resources/input/fsh/examples/Example_Operation_Close.fsh
+++ b/Resources/input/fsh/examples/Example_Operation_Close.fsh
@@ -25,7 +25,7 @@ Instance: ExampleOperationCloseInputParametersMultipleMedicationDispenses
 InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input
 Usage: #example
 Title: "Example Close Parameters"
-* parameter[rxDispensation]
+* parameter[rxDispensation][+]
   * name = "rxDispensation"
   * part[medicationDispense]
     * name = "medicationDispense"
@@ -33,7 +33,7 @@ Title: "Example Close Parameters"
   * part[medication]
     * name = "medication"
     * resource = SumatripanMedication
-* parameter[rxDispensation]
+* parameter[rxDispensation][+]
   * name = "rxDispensation"
   * part[medicationDispense]
     * name = "medicationDispense"
diff --git a/Resources/input/fsh/examples/Example_Task.fsh b/Resources/input/fsh/examples/Example_Task.fsh
index 4066b014..292f1fe4 100644
--- a/Resources/input/fsh/examples/Example_Task.fsh
+++ b/Resources/input/fsh/examples/Example_Task.fsh
@@ -44,7 +44,7 @@ Usage: #example
 * intent = #order
 * authoredOn = "2022-03-18T15:26:00+00:00"
 * performerType[+].coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType#urn:oid:1.2.276.0.76.4.54 "Öffentliche Apotheke"
-* for.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* for.identifier.system = $identifier-kvid-10
 * for.identifier.value = "X123456789"
 * lastModified = "2022-03-18T15:27:00+00:00"
 * input[ePrescription].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#1 "Health Care Provider Prescription"
@@ -73,7 +73,7 @@ Usage: #example
 * intent = #order
 * authoredOn = "2022-03-18T15:26:00+00:00"
 * performerType[+].coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType#urn:oid:1.2.276.0.76.4.54 "Öffentliche Apotheke"
-* for.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* for.identifier.system = $identifier-kvid-10
 * for.identifier.value = "X123456789"
 * lastModified = "2022-03-18T15:28:00+00:00"
 * input[ePrescription].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#1 "Health Care Provider Prescription"
@@ -102,7 +102,7 @@ Usage: #example
 * intent = #order
 * authoredOn = "2022-03-18T15:26:00+00:00"
 * performerType[+].coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType#urn:oid:1.2.276.0.76.4.54 "Öffentliche Apotheke"
-* for.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* for.identifier.system = $identifier-kvid-10
 * for.identifier.value = "X123456789"
 * lastModified = "2022-03-18T15:28:00+00:00"
 * input[ePrescription].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#1 "Health Care Provider Prescription"
@@ -133,7 +133,7 @@ Usage: #example
 * intent = #order
 * authoredOn = "2022-03-18T15:26:00+00:00"
 * performerType[+].coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType#urn:oid:1.2.276.0.76.4.54 "Öffentliche Apotheke"
-* for.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* for.identifier.system = $identifier-kvid-10
 * for.identifier.value = "X123456789"
 * lastModified = "2022-03-18T15:28:00+00:00"
 * input[ePrescription].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#1 "Health Care Provider Prescription"
@@ -162,7 +162,7 @@ Usage: #example
 * intent = #order
 * authoredOn = "2022-03-18T15:26:00+00:00"
 * performerType[+].coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType#urn:oid:1.2.276.0.76.4.54 "Öffentliche Apotheke"
-* for.identifier.system = "http://fhir.de/sid/gkv/kvid-10"
+* for.identifier.system = $identifier-kvid-10
 * for.identifier.value = "X123456789"
 * lastModified = "2022-03-18T15:29:00+00:00"
 * input[ePrescription].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#1 "Health Care Provider Prescription"
diff --git a/Resources/input/fsh/extensions/GEM_ERP_EX_DeepLink.fsh b/Resources/input/fsh/extensions/GEM_ERP_EX_DeepLink.fsh
index 2e611524..83e6f3bd 100644
--- a/Resources/input/fsh/extensions/GEM_ERP_EX_DeepLink.fsh
+++ b/Resources/input/fsh/extensions/GEM_ERP_EX_DeepLink.fsh
@@ -3,5 +3,6 @@ Id: GEM-ERP-EX-DeepLink
 Title: "DiGA-DeepLink"
 Description: "Contains information regarding deep link for a DiGA."
 Context: MedicationDispense
+* insert StructureDefinition(GEM_ERP_EX_DeepLink)
 * . ^short = "Statement of a deep link which can be used to open the DiGA."
 * value[x] only url
\ No newline at end of file
diff --git a/Resources/input/fsh/extensions/GEM_ERP_EX_RedeemCode.fsh b/Resources/input/fsh/extensions/GEM_ERP_EX_RedeemCode.fsh
index 46e5a0d8..40ca7b8f 100644
--- a/Resources/input/fsh/extensions/GEM_ERP_EX_RedeemCode.fsh
+++ b/Resources/input/fsh/extensions/GEM_ERP_EX_RedeemCode.fsh
@@ -2,6 +2,7 @@ Extension: GEM_ERP_EX_RedeemCode
 Id: GEM-ERP-EX-RedeemCode
 Title: "DiGA-RedeemCode"
 Description: "States the redeem code for a DiGA."
+* insert StructureDefinition(GEM_ERP_EX_RedeemCode)
 * ^context[0].type = #element
 * ^context[=].expression = "MedicationDispense"
 * value[x] only string
diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_AuditEvent.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_AuditEvent.fsh
index b336f22d..1e006cad 100644
--- a/Resources/input/fsh/profiles/GEM_ERP_PR_AuditEvent.fsh
+++ b/Resources/input/fsh/profiles/GEM_ERP_PR_AuditEvent.fsh
@@ -15,7 +15,7 @@ Title: "AuditEvent for Logging of ePrescription Access"
 * outcome 1..
 * agent.type 1..
 * agent.who.identifier 1..
-* agent.who.identifier only IdentifierTelematikId or $identifier-kvid-10 or $identifier-pkv
+* agent.who.identifier only IdentifierTelematikId or IdentifierKvid10
 * agent.name 1..
 * source.site 1..
 * source.site = "E-Rezept Fachdienst" (exactly)
diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh
index 3081d878..cf04f99b 100644
--- a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh
+++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh
@@ -29,7 +29,7 @@ Description: "Ressource used for the communication of dispense request between p
   * ^short = "The entity (e.g. person, organization) which was the source of the communication."
   * ^comment = "Set by ePrescription server using client AuthN-Credential"
 * sender.identifier 1.. MS
-* sender.identifier only $identifier-kvid-10 or $identifier-pkv
+* sender.identifier only IdentifierKvid10
 * payload 0..1 MS
 //* payload.extension ^slicing.discriminator.type = #value
 //* payload.extension ^slicing.discriminator.path = "url"
diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh
index e2807f51..9b32f464 100644
--- a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh
+++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh
@@ -13,7 +13,6 @@ Description: "Ressource used for the communication of informative requests betwe
 * basedOn ^type.aggregation = #referenced
 * basedOn.reference 1..1
 * status = #unknown (exactly)
-* about 1..
 * about only Reference(Medication)
 * about ^type.aggregation = #contained
 * about.reference 1..1
@@ -33,7 +32,7 @@ Description: "Ressource used for the communication of informative requests betwe
   * ^comment = "Set by ePrescription server using client AuthN-Credential"
 * sender ^definition = "Message sender - set by ePrescription server using client AuthN-Credential\r\nThe entity (e.g. person, organization) which was the source of the communication."
 * sender.identifier 1..1
-* sender.identifier only $identifier-kvid-10 or $identifier-pkv
+* sender.identifier only IdentifierKvid10
 * payload 1..1
 * payload.extension ^slicing.discriminator.type = #value
 * payload.extension ^slicing.discriminator.path = "url"
diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh
index 2ead729b..3ae70a73 100644
--- a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh
+++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh
@@ -27,14 +27,14 @@ Description: "Ressource used for the communication of the reply to dispense/info
   * ^short = "The entity (e.g. person, organization) which was the target of the communication."
   * ^comment = "This needs to be set by the sender of the communication to define the target."
 * recipient.identifier 1..1
-* recipient.identifier only $identifier-kvid-10 or $identifier-pkv
+* recipient.identifier only IdentifierKvid10
 //* sender only Reference(Organization or Practitioner or PractitionerRole or HealthcareService)
 * sender MS
   * ^short = "The entity (e.g. person, organization) which was the source of the communication."
   * ^comment = "Set by ePrescription server using client AuthN-Credential"
 * sender ^definition = "Message sender - set by ePrescription server using client AuthN-Credential\r\nThe entity (e.g. person, organization) which was the source of the communication."
 * sender.identifier 1..1
-* sender.identifier only $identifier-kvid-10 or $identifier-pkv or IdentifierTelematikId
+* sender.identifier only IdentifierKvid10 or IdentifierTelematikId
 * payload 1..1
 * payload.extension ^slicing.discriminator.type = #value
 * payload.extension ^slicing.discriminator.path = "url"
diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Representative.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Representative.fsh
index 6614c147..c81b2068 100644
--- a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Representative.fsh
+++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Representative.fsh
@@ -23,12 +23,12 @@ Description: "Ressource used for the communication between patients and their re
   * ^short = "The entity (e.g. person, organization) which was the target of the communication."
   * ^comment = "This needs to be set by the sender of the communication to define the target."
 * recipient.identifier 1.. MS
-* recipient.identifier only $identifier-kvid-10 or $identifier-pkv
+* recipient.identifier only IdentifierKvid10
 * sender MS
   * ^short = "The entity (e.g. person, organization) which was the source of the communication."
   * ^comment = "Set by ePrescription server using client AuthN-Credential"
 * sender ^definition = "Message sender - set by ePrescription server using client AuthN-Credential\r\nThe entity (e.g. person, organization) which was the source of the communication."
 * sender.identifier 1.. MS
-* sender.identifier only $identifier-kvid-10 or $identifier-pkv
+* sender.identifier only IdentifierKvid10
 * payload 1..1 MS
 * payload.content[x] only string
diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh
index ac0ede6c..59f529ac 100644
--- a/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh
+++ b/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh
@@ -23,14 +23,14 @@ Description: "Handles information about the dispensed DiGA"
 
 * medication[x] only Reference
 * medication[x] MS
-* medication[x] ^definition = "Information about the medication that is being dispensed. To include are name and the identifier of a DiGA prescription unit." //TODO: Identifier benennen
+* medication[x] ^definition = "Information about the medication that is being dispensed. To include are name and the PZN-identifier of a DiGA prescription unit."
 * medicationReference.display 0..1 MS
   * ^short = "Name of the DiGA prescription unit."
 * medicationReference.identifier 0..1 MS
 * medicationReference.identifier.system 1..1 MS
-// * medicationReference.identifier.system = $pzn (exactly) //TODO: Festlegen, welches System genutzt werden soll
+* medicationReference.identifier.system = $cs-pzn (exactly)
 * medicationReference.identifier.value 1..1 MS
- // * ^short = "Unique identification number for a prescription unit of a DiGA (PZN)."
+  * ^short = "Unique identification number for a prescription unit of a DiGA (PZN)."
 
 // Extension, falls die DiGA vom Kostenträger nicht bezahlt wird
 * medicationReference.extension contains DataAbsentReason named data-absent-reason 0..1
@@ -39,7 +39,7 @@ Description: "Handles information about the dispensed DiGA"
 // KVNR des Versicherten
 * subject 1..
 * subject.identifier 1..
-* subject.identifier only $identifier-kvid-10 // Hier nur die KVNR der GKV, da für PKV kein DiGA angedacht ist
+* subject.identifier only IdentifierKvid10
 * subject.identifier ^short = "The patients KVNR"
 * subject.identifier ^comment = "There is no PKV identifier available since it is not in the scope for DiGA prescriptions."
 
@@ -58,15 +58,15 @@ Description: "Handles information about the dispensed DiGA"
 
 Invariant: workflow-medicationdispense-redeemcode-1
 Description: "A note was not found, but is mandatory if no redeem code is provided."
-Expression: "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode').empty() implies note.exists()"
+Expression: "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').empty() implies note.exists()"
 Severity: #error
 
 Invariant: workflow-medicationdispense-redeemcode-2
 Description: "The data absent reason was not found, but is mandatory if no redeem code is provided."
-Expression: "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode').empty() implies medicationReference.extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists()"
+Expression: "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').empty() implies medicationReference.extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists()"
 Severity: #error
 
 Invariant: workflow-medicationdispense-redeemcode-3
 Description: "Name and identifier of the DiGA was not found, but is mandatory if a redeem code is provided."
-Expression: "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode').exists() implies (medicationReference.display.exists() and medicationReference.identifier.exists())"
+Expression: "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').exists() implies (medicationReference.display.exists() and medicationReference.identifier.exists())"
 Severity: #error
diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Task.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Task.fsh
index 88757ccc..81fd464d 100644
--- a/Resources/input/fsh/profiles/GEM_ERP_PR_Task.fsh
+++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Task.fsh
@@ -31,7 +31,7 @@ Description: "This resource manages the ePrescription workflow"
 * identifier[Secret].value 1..
 * intent = #order (exactly)
 * for ^short = "Identifier of Patient (KVID or PKV-Identifier)"
-* for.identifier only $identifier-kvid-10 or $identifier-pkv
+* for.identifier only IdentifierKvid10
 * performerType.coding from GEM_ERP_VS_OrganizationType (required)
 * performerType.coding 1..
 * input ..2 MS
diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml
index 82e00630..bfdc5fe8 100644
--- a/Resources/sushi-config.yaml
+++ b/Resources/sushi-config.yaml
@@ -3,7 +3,7 @@ fhirVersion: 4.0.1
 FSHOnly: true
 applyExtensionMetadataToRoot: false
 
-version: "1.4.0"
+version: "1.4.1"
 dependencies:
   hl7.fhir.r4.core: 4.0.1
   de.basisprofil.r4: 1.5.0
diff --git a/install_fhir_tools.sh b/install_fhir_tools.sh
deleted file mode 100644
index 9c97dc11..00000000
--- a/install_fhir_tools.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-echo "##### Installing Java"
-sudo apt install openjdk-17-jre-headless -y
-
-echo "##### Installing Sushi"
-sudo npm install -g fsh-sushi
-
-echo "##### Installing dotnet-sdk-3.1"
-wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-sudo dpkg -i packages-microsoft-prod.deb
-rm packages-microsoft-prod.deb
-sudo apt-get update; \
-  sudo apt-get install -y apt-transport-https && \
-  sudo apt-get update && \
-  sudo apt-get install -y dotnet-sdk-3.1
-
-echo "##### Installing firely.terminal"
-sudo dotnet tool install --global firely.terminal --version 2.5.0-beta-7
-
-echo "##### Installing yq yaml-parser"
-sudo snap install yq
-
-echo "##### Installing rename"
-sudo apt install rename
\ No newline at end of file
diff --git a/package.json b/package.json
index 1a2bd7a9..1fc838f0 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
     "4.0.1"
   ],
   "name": "de.gematik.erezept-workflow.r4",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "ePrescription workflow specification.",
   "author": "gematik",
   "dependencies": {
diff --git a/validate.sh b/validate.sh
deleted file mode 100755
index 28d420d0..00000000
--- a/validate.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-clear
-# This script will download the latest validation script from the template source save it
-# to the scripts_folder and execute it to validate your fhir ressources.
-script_name=downloaded_validation_script.sh
-script_path=./scripts/$script_name
-
-parentdir="$(dirname "$script_path")"
-mkdir -p "$parentdir"
-
-curl https://raw.githubusercontent.com/gematik/spec-TemplateForSimplifierProjects/master/scripts/$script_name -o $script_path
-chmod a+x $script_path
-$script_path "$@"