IKNL · HarmkeKoning · Jun 4, 2026 · Mar 10, 2026 · Mar 10, 2026 · Mar 10, 2026
diff --git a/.github/workflows/r4_firely_terminal.yaml b/.github/workflows/r4_firely_terminal.yaml
@@ -30,7 +30,7 @@ jobs:
           java-version: '21'
 
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/firely-terminal-pipeline@v0.7.32-alpha2
+        uses: FirelyTeam/firely-terminal-pipeline@v0.8.1
         with:
           PATH_TO_CONFORMANCE_RESOURCES: fsh-generated/resources
           PATH_TO_EXAMPLES: fsh-generated/resources

diff --git a/.github/workflows/r4_firely_terminal_nts.yaml b/.github/workflows/r4_firely_terminal_nts.yaml
@@ -65,7 +65,7 @@ jobs:
           echo "JAVA_TOOL_OPTIONS=-Dhttp.proxyHost=localhost -Dhttp.proxyPort=8080 -Dhttps.proxyHost=localhost -Dhttps.proxyPort=8080 -Dhttp.nonProxyHosts=" >> $GITHUB_ENV
 
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/firely-terminal-pipeline@v0.7.32-alpha2
+        uses: FirelyTeam/firely-terminal-pipeline@v0.8.1
         with:
           PATH_TO_CONFORMANCE_RESOURCES: fsh-generated/resources
           PATH_TO_EXAMPLES: fsh-generated/resources

diff --git a/input/fsh/Alias.fsh b/input/fsh/Alias.fsh
@@ -1,5 +1,7 @@
 Alias: $snomed = http://snomed.info/sct
 Alias: $v3-NullFlavor = http://terminology.hl7.org/CodeSystem/v3-NullFlavor
+Alias: $DHD-CBV = urn:oid:2.16.840.1.113883.2.4.3.120.5.3
+Alias: $NZa = urn:oid:2.16.840.1.113883.2.4.3.27.15.5
 Alias: $DataAbsentReason = http://terminology.hl7.org/CodeSystem/data-absent-reason
 Alias: $v2-0203 = http://terminology.hl7.org/CodeSystem/v2-0203
 Alias: $v3-RoleCode = http://terminology.hl7.org/CodeSystem/v3-RoleCode

diff --git a/input/fsh/CapabilityStatement.fsh b/input/fsh/CapabilityStatement.fsh
@@ -139,7 +139,11 @@ Usage: #definition
       * valueCode = #SHOULD
     * type = #Observation
     // Supported profiles for Observation resource are set to SHOULD because not all Observation have to be implemented.
-    * supportedProfile[0] = "https://api.iknl.nl/docs/pzp/r4/StructureDefinition/ACP-OrganDonationChoiceRegistration"
+    * supportedProfile[0] = "https://api.iknl.nl/docs/pzp/r4/StructureDefinition/ACP-LegallyCapable"
+      * extension
+        * url = $CapExpectation
+        * valueCode = #SHOULD
+    * supportedProfile[+] = "https://api.iknl.nl/docs/pzp/r4/StructureDefinition/ACP-OrganDonationChoiceRegistration"
       * extension
         * url = $CapExpectation
         * valueCode = #SHOULD 
@@ -483,7 +487,11 @@ Usage: #definition
       * valueCode = #SHALL
     * type = #Observation
     // Supported profiles for Observation resource are set to SHOULD because not all Observation have to be implemented.
-    * supportedProfile[0] = "https://api.iknl.nl/docs/pzp/r4/StructureDefinition/ACP-OrganDonationChoiceRegistration"
+    * supportedProfile[0] = "https://api.iknl.nl/docs/pzp/r4/StructureDefinition/ACP-LegallyCapable"
+      * extension
+        * url = $CapExpectation
+        * valueCode = #SHOULD 
+    * supportedProfile[+] = "https://api.iknl.nl/docs/pzp/r4/StructureDefinition/ACP-OrganDonationChoiceRegistration"
       * extension
         * url = $CapExpectation
         * valueCode = #SHOULD 
@@ -567,7 +575,7 @@ Usage: #definition
     * extension
       * url = $CapExpectation
       * valueCode = #SHALL
-    * type = #Communication
+    * type = #CommunicationRequest
     * supportedProfile[0] = "https://api.iknl.nl/docs/pzp/r4/StructureDefinition/ACP-InformRelativesRequest"
       * extension
         * url = $CapExpectation

diff --git a/input/fsh/CommunicationRequest.fsh b/input/fsh/CommunicationRequest.fsh
@@ -7,13 +7,17 @@ Description: "A CommunicationRequest representing the advice or instruction give
 * category 1..*
 * category = $snomed#223449006
 * category ^comment = "The `category.text` element may be used to provide additional context for human readers next to the pattern category coding, for example: 'Request for patient to inform relatives about treatment agreements'."
+* subject 1..1
 * subject only Reference(ACPPatient)
 * encounter only Reference(ACPEncounter)
+* requester 1..1
 * requester only Reference(ACPHealthProfessionalPractitionerRole or ACPHealthProfessionalPractitioner) 
+* sender 1..1
 * sender only Reference(ACPPatient)
 * recipient only Reference(ACPContactPerson)
 * reasonCode 1..*
 * reasonCode = $snomed#713603004 // "advance care planning"
+* obeys cr-date-required
 
 * insert ObligationRules(category) // already 1..1 so may not be needed place under obligation but added for consistency
 * insert ObligationRules(subject)
@@ -25,11 +29,17 @@ Description: "A CommunicationRequest representing the advice or instruction give
 * insert ObligationRules(reasonCode) // already 1..1 so may not be needed place under obligation but added for consistency
 
 
+Invariant: cr-date-required
+Description: "The date of the CommunicationRequest is expected to be captured either in the resource itself or in the Encounter in which the CommunicationRequest originated."
+Severity: #error
+Expression: "authoredOn.exists() or encounter.exists()"
+
+
 Mapping: MapACPInformRelativesRequest
-Id: pall-izppz-zib2020v2026-02-24
+Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPInformRelativesRequest
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-02-24T09:29:59"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
 * -> "734" "Heeft u patient geïnformeerd over eigen verantwoordelijkheid om deze behandelafspraken met naasten te bespreken?"
 
 

diff --git a/input/fsh/Consent.fsh b/input/fsh/Consent.fsh
@@ -20,10 +20,10 @@ Description: "A verbal or written description of the patient’s wishes with reg
 
 
 Mapping: MapACPAdvanceDirective
-Id: pall-izppz-zib2020v2026-02-24
+Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPAdvanceDirective
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-02-24T09:29:59"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
 * -> "690" "Euthanasieverklaring (Wilsverklaring)"
 * -> "700" "Keuze orgaandonatie vastgelegd (Wilsverklaring)"
 * -> "721" "Eerder vastgelegde behandelafspraken (Wilsverklaring)"
@@ -123,10 +123,10 @@ Description: "A joint decision between a health professional (for example a gene
 
 
 Mapping: MapACPTreatmentDirective
-Id: pall-izppz-zib2020v2026-02-24
+Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPTreatmentDirective
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-02-24T09:29:59"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
 * -> "602" "Behandelgrens (BehandelAanwijzing)"
 * -> "637" "Afspraak uitzetten ICD (BehandelAanwijzing)"
 * modifierExtension[specificationOther] -> "605" "SpecificatieAnders"

diff --git a/input/fsh/Device.fsh b/input/fsh/Device.fsh
@@ -15,10 +15,10 @@ Description: "The medical device (internally or externally). In the context of A
 
 
 Mapping: MapACPMedicalDeviceProductICD
-Id: pall-izppz-zib2020v2026-02-24
+Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPMedicalDeviceProductICD
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-02-24T09:29:59"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
 * -> "621" "Product"
 * identifier[gs1ProductID] -> "622" "ProductID"
 * identifier[hibcProductID] -> "622" "ProductID"

diff --git a/input/fsh/DeviceUseStatement.fsh b/input/fsh/DeviceUseStatement.fsh
@@ -19,10 +19,10 @@ Description: "Any internally implanted and external devices and/or aids used by
 * insert ObligationRules(note.text)
 
 Mapping: MapACPMedicalDevice
-Id: pall-izppz-zib2020v2026-02-24
+Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPMedicalDevice
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-02-24T09:29:59"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
 * -> "619" "Heeft de patient een ICD?"
 * -> "620" "ICD (MedischHulpmiddel)"
 * extension[healthProfessional]  -> "635" "Zorgverlener"

diff --git a/input/fsh/Encounter.fsh b/input/fsh/Encounter.fsh
@@ -25,10 +25,10 @@ Description: "Any interaction, regardless of the situation, between a patient an
 
 
 Mapping: MapACPEncounter
-Id: pall-izppz-zib2020v2026-02-24
+Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPEncounter
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-02-24T09:29:59"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
 * -> "808" "Contact"
 * class -> "809" "ContactType"
 * subject -> "514" "Gesprek gevoerd in bijzijn van (Patient)" // In R5 patient is added to .participant.individual. For now, if present at .subject, we assume the patient was present. Also clear from the definition of the subject element: "The patient or group present at the encounter" 

diff --git a/input/fsh/Extension.fsh b/input/fsh/Extension.fsh
diff --git a/input/fsh/Goal.fsh b/input/fsh/Goal.fsh
@@ -16,10 +16,10 @@ Description: "The primary, agreed-upon goal of a patient's medical treatment pol
 * insert ObligationRules(note.text)
 
 Mapping: MapACPMedicalPolicyGoal
-Id: pall-izppz-zib2020v2026-02-24
+Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPMedicalPolicyGoal
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-02-24T09:29:59"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
 * -> "590" "Belangrijkste doel van behandeling ([Meting])"
 * -> "591" "Belangrijkste doel van behandeling ([MetingNaam])"
 * description -> "592" "Doel ([MetingWaarde])"