diff --git a/input/fsh/instances/DiagnosticReport-hemoglobin.fsh b/input/fsh/instances/DiagnosticReport-hemoglobin.fsh
index 171365d4..d0802cc2 100644
--- a/input/fsh/instances/DiagnosticReport-hemoglobin.fsh
+++ b/input/fsh/instances/DiagnosticReport-hemoglobin.fsh
@@ -1,5 +1,5 @@
Instance: hemoglobin-of-DiagnosticReport
-InstanceOf: DiagnosticReport
+InstanceOf: DiagnosticReportUvIps
Title: "DiagnosticReport: hemoglobin example"
Description: "DiagnosticReport: hemoglobin example"
Usage: #example
diff --git a/input/fsh/instances/IPS-bundle-01.fsh b/input/fsh/instances/IPS-bundle-01.fsh
index 3b878c2e..3006a503 100644
--- a/input/fsh/instances/IPS-bundle-01.fsh
+++ b/input/fsh/instances/IPS-bundle-01.fsh
@@ -1,5 +1,5 @@
Instance: IPS-examples-Bundle-01
-InstanceOf: Bundle
+InstanceOf: BundleUvIps
Title: "IPS Bundle example"
Description: "IPS Bundle example"
Usage: #example
diff --git a/input/fsh/instances/IPS-bundle-with-immunization.fsh b/input/fsh/instances/IPS-bundle-with-immunization.fsh
index e2f551d4..182d60e1 100644
--- a/input/fsh/instances/IPS-bundle-with-immunization.fsh
+++ b/input/fsh/instances/IPS-bundle-with-immunization.fsh
@@ -1,5 +1,5 @@
Instance: IPS-examples-Bundle-with-immunization
-InstanceOf: Bundle
+InstanceOf: BundleUvIps
Title: "IPS Bundle example with Immunization"
Description: "IPS Bundle example with Immunization section"
Usage: #example
diff --git a/input/fsh/instances/Immunization-75680.fsh b/input/fsh/instances/Immunization-75680.fsh
index 300b3bdc..d9f9e992 100644
--- a/input/fsh/instances/Immunization-75680.fsh
+++ b/input/fsh/instances/Immunization-75680.fsh
@@ -1,5 +1,5 @@
Instance: 75680
-InstanceOf: Immunization
+InstanceOf: ImmunizationUvIps
Title: "Immunization: Vaccin anti diphtérie-coqueluche-tétanos-poliomyélite (Luxembourg)"
Description: "Immunization: Vaccin anti diphtérie-coqueluche-tétanos-poliomyélite (Luxembourg)"
Usage: #example
diff --git a/input/fsh/instances/MedicationRequest-eumfh-39-07-1-request.fsh b/input/fsh/instances/MedicationRequest-eumfh-39-07-1-request.fsh
index 9ed14212..efb28b99 100644
--- a/input/fsh/instances/MedicationRequest-eumfh-39-07-1-request.fsh
+++ b/input/fsh/instances/MedicationRequest-eumfh-39-07-1-request.fsh
@@ -1,5 +1,5 @@
Instance: eumfh-39-07-1-request
-InstanceOf: MedicationRequest
+InstanceOf: MedicationRequestIPS
Title: "MedicationRequest: Simvastatin request"
Description: "MedicationRequest: Simvastatin request"
Usage: #example
diff --git a/input/fsh/instances/Organization-simple-org.fsh b/input/fsh/instances/Organization-simple-org.fsh
index a7df80ce..d88fe686 100644
--- a/input/fsh/instances/Organization-simple-org.fsh
+++ b/input/fsh/instances/Organization-simple-org.fsh
@@ -1,5 +1,5 @@
Instance: simple-org
-InstanceOf: Organization
+InstanceOf: OrganizationUvIps
Title: "Organization: simple example"
Description: "Very Simple Organization example"
Usage: #example
diff --git a/input/fsh/instances/Patient-66033.fsh b/input/fsh/instances/Patient-66033.fsh
index b01818dd..96d79baf 100644
--- a/input/fsh/instances/Patient-66033.fsh
+++ b/input/fsh/instances/Patient-66033.fsh
@@ -1,5 +1,5 @@
Instance: 66033
-InstanceOf: Patient
+InstanceOf: PatientUvIps
Title: "Patient: minimal example"
Description: "Patient: minimal example"
Usage: #example
diff --git a/input/fsh/instances/PractitionerRole-simple-pr.fsh b/input/fsh/instances/PractitionerRole-simple-pr.fsh
index 3d11df13..1de6b346 100644
--- a/input/fsh/instances/PractitionerRole-simple-pr.fsh
+++ b/input/fsh/instances/PractitionerRole-simple-pr.fsh
@@ -1,5 +1,5 @@
Instance: simple-pr
-InstanceOf: PractitionerRole
+InstanceOf: PractitionerRoleUvIps
Title: "PractitionerRole: simple example"
Description: "Very Simple PractitionerRole example"
Usage: #example
diff --git a/input/fsh/instances/allergyIntolerance-39-07-1.fsh b/input/fsh/instances/allergyIntolerance-39-07-1.fsh
index 137478ae..cea98b59 100644
--- a/input/fsh/instances/allergyIntolerance-39-07-1.fsh
+++ b/input/fsh/instances/allergyIntolerance-39-07-1.fsh
@@ -1,5 +1,5 @@
Instance: eumfh-39-07-1-of-AllergyIntolerance
-InstanceOf: AllergyIntolerance
+InstanceOf: AllergyIntoleranceUvIps
Title: "AllergyIntolerance: No known allergies"
Description: "AllergyIntolerance: No known allergies"
Usage: #example
diff --git a/input/fsh/instances/allergyIntolerance-with-abatement.fsh b/input/fsh/instances/allergyIntolerance-with-abatement.fsh
index f7a3abba..218a78b7 100644
--- a/input/fsh/instances/allergyIntolerance-with-abatement.fsh
+++ b/input/fsh/instances/allergyIntolerance-with-abatement.fsh
@@ -1,5 +1,5 @@
Instance: allergyintolerance-with-abatement
-InstanceOf: AllergyIntolerance
+InstanceOf: AllergyIntoleranceUvIps
Title: "AllergyIntolerance: resolved allergy"
Description: "AllergyIntolerance: resolved allergy"
Usage: #example
diff --git a/input/fsh/instances/allergyintolerance-multiple-codings.fsh b/input/fsh/instances/allergyintolerance-multiple-codings.fsh
index f01cf1c3..dc3b9999 100644
--- a/input/fsh/instances/allergyintolerance-multiple-codings.fsh
+++ b/input/fsh/instances/allergyintolerance-multiple-codings.fsh
@@ -1,5 +1,5 @@
Instance: allergyintolerance-multiple-codings
-InstanceOf: AllergyIntolerance
+InstanceOf: AllergyIntoleranceUvIps
Title: "AllergyIntolerance: multiple codings"
Description: "AllergyIntolerance: multiple codings"
Usage: #example
diff --git a/input/fsh/instances/bundle-minimal.fsh b/input/fsh/instances/bundle-minimal.fsh
index f63f5d74..db16f5b9 100644
--- a/input/fsh/instances/bundle-minimal.fsh
+++ b/input/fsh/instances/bundle-minimal.fsh
@@ -1,5 +1,5 @@
Instance: bundle-minimal
-InstanceOf: Bundle
+InstanceOf: BundleUvIps
Title: "IPS Bundle example - minimal"
Description: "IPS Bundle example - minimal"
Usage: #example
@@ -173,5 +173,4 @@ Usage: #inline
* criticality = #high
* code = $sct#373270004 "Substance with penicillin structure and antibacterial mechanism of action (substance)"
* patient = Reference(urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad)
-* onsetDateTime = "2010"
-
+* onsetDateTime = "2010"
\ No newline at end of file
diff --git a/input/fsh/instances/bundle-no-info-required-sections.fsh b/input/fsh/instances/bundle-no-info-required-sections.fsh
index e7543d2b..39f5e58d 100644
--- a/input/fsh/instances/bundle-no-info-required-sections.fsh
+++ b/input/fsh/instances/bundle-no-info-required-sections.fsh
@@ -1,5 +1,5 @@
Instance: bundle-no-info-required-sections
-InstanceOf: Bundle
+InstanceOf: BundleUvIps
Title: "IPS Bundle example - no information in required sections"
Description: "IPS Bundle example - no information in required sections"
Usage: #example
diff --git a/input/fsh/instances/composition-minimal.fsh b/input/fsh/instances/composition-minimal.fsh
index a768a382..e754772f 100644
--- a/input/fsh/instances/composition-minimal.fsh
+++ b/input/fsh/instances/composition-minimal.fsh
@@ -1,5 +1,5 @@
Instance: composition-minimal
-InstanceOf: Composition
+InstanceOf: CompositionUvIps
Title: "IPS Composition example - minimal"
Description: "IPS Composition example - minimal"
Usage: #example
@@ -22,18 +22,18 @@ Usage: #example
* relatesTo.targetIdentifier.value = "20e12ce3-857f-49c0-b888-cb670597f191"
* event.code = $v3-ActClass#PCPR
* event.period.end = "2020-12-11T14:30:00+01:00"
-* section[0].title = "Active Problems"
-* section[=].code = $loinc#11450-4 "Problem list - Reported"
-* section[=].text.status = #generated
-* section[=].text.div = "
"
-* section[=].entry = Reference(Condition/eumfh-39-07-1)
-* section[+].title = "Medication"
-* section[=].code = $loinc#10160-0 "History of Medication use Narrative"
-* section[=].text.status = #generated
-* section[=].text.div = "Medication Name: Simvastatin 40 MG Disintegrating Oral Tablet
Code: C10AA01
Status: Active, started 2014
Instructions: Take 40 mg/day
"
-* section[=].entry = Reference(MedicationStatement/eumfh-39-07-1)
-* section[+].title = "Allergies and Intolerances"
-* section[=].code = $loinc#48765-2 "Allergies and adverse reactions Document"
-* section[=].text.status = #generated
-* section[=].text.div = ""
-* section[=].entry = Reference(AllergyIntolerance/eumfh-39-07-1)
\ No newline at end of file
+* section[sectionProblems].title = "Active Problems"
+* section[sectionProblems].code = $loinc#11450-4 "Problem list - Reported"
+* section[sectionProblems].text.status = #generated
+* section[sectionProblems].text.div = ""
+* section[sectionProblems].entry = Reference(Condition/eumfh-39-07-1)
+* section[sectionMedications].title = "Medication"
+* section[sectionMedications].code = $loinc#10160-0 "History of Medication use Narrative"
+* section[sectionMedications].text.status = #generated
+* section[sectionMedications].text.div = "Medication Name: Simvastatin 40 MG Disintegrating Oral Tablet
Code: C10AA01
Status: Active, started 2014
Instructions: Take 40 mg/day
"
+* section[sectionMedications].entry = Reference(MedicationStatement/eumfh-39-07-1)
+* section[sectionAllergies].title = "Allergies and Intolerances"
+* section[sectionAllergies].code = $loinc#48765-2 "Allergies and adverse reactions Document"
+* section[sectionAllergies].text.status = #generated
+* section[sectionAllergies].text.div = ""
+* section[sectionAllergies].entry = Reference(AllergyIntolerance/eumfh-39-07-1)
\ No newline at end of file
diff --git a/input/fsh/instances/condition-39-07-1.fsh b/input/fsh/instances/condition-39-07-1.fsh
index 532b2706..33aba42a 100644
--- a/input/fsh/instances/condition-39-07-1.fsh
+++ b/input/fsh/instances/condition-39-07-1.fsh
@@ -1,5 +1,5 @@
Instance: eumfh-39-07-1-of-Condition
-InstanceOf: Condition
+InstanceOf: ConditionUvIps
Title: "Condition: Acute myeloid leukemia"
Description: "Condition: Acute myeloid leukemia"
Usage: #example
diff --git a/input/fsh/instances/device-70-275-1.fsh b/input/fsh/instances/device-70-275-1.fsh
index 438311a9..8acc4bb1 100644
--- a/input/fsh/instances/device-70-275-1.fsh
+++ b/input/fsh/instances/device-70-275-1.fsh
@@ -1,5 +1,5 @@
Instance: eumfh-70-275-1-of-Device
-InstanceOf: Device
+InstanceOf: DeviceUvIps
Title: "Device: No known devices in use"
Description: "Device: No known devices in use"
Usage: #example
diff --git a/input/fsh/instances/device-imaging-example-1.fsh b/input/fsh/instances/device-imaging-example-1.fsh
index 117e9e01..803f9f35 100644
--- a/input/fsh/instances/device-imaging-example-1.fsh
+++ b/input/fsh/instances/device-imaging-example-1.fsh
@@ -1,5 +1,5 @@
Instance: ips-example-imaging-1-of-Device
-InstanceOf: Device
+InstanceOf: DeviceObserverUvIps
Title: "Device: device observer example"
Description: "Device: device observer example"
Usage: #example
diff --git a/input/fsh/instances/deviceUseStatement-70-275-1.fsh b/input/fsh/instances/deviceUseStatement-70-275-1.fsh
index 7255a235..d1e7c6e3 100644
--- a/input/fsh/instances/deviceUseStatement-70-275-1.fsh
+++ b/input/fsh/instances/deviceUseStatement-70-275-1.fsh
@@ -1,5 +1,5 @@
Instance: eumfh-70-275-1-of-DeviceUseStatement
-InstanceOf: DeviceUseStatement
+InstanceOf: DeviceUseStatementUvIps
Title: "DeviceUseStatement: No known devices in use"
Description: "DeviceUseStatement: No known devices in use"
Usage: #example
diff --git a/input/fsh/instances/imagingStudy-imaging-ex-5-1.fsh b/input/fsh/instances/imagingStudy-imaging-ex-5-1.fsh
index fa3f413e..2980e6a7 100644
--- a/input/fsh/instances/imagingStudy-imaging-ex-5-1.fsh
+++ b/input/fsh/instances/imagingStudy-imaging-ex-5-1.fsh
@@ -1,5 +1,5 @@
Instance: TII-ImagingStudy-5-1
-InstanceOf: ImagingStudy
+InstanceOf: ImagingStudyUvIps
Title: "ImagingStudy: referred DICOM study"
Description: "ImagingStudy: referred DICOM study"
Usage: #example
diff --git a/input/fsh/instances/medication-39-07-1.fsh b/input/fsh/instances/medication-39-07-1.fsh
index e3e82b67..607ba14d 100644
--- a/input/fsh/instances/medication-39-07-1.fsh
+++ b/input/fsh/instances/medication-39-07-1.fsh
@@ -1,5 +1,5 @@
Instance: eumfh-39-07-1-of-Medication
-InstanceOf: Medication
+InstanceOf: MedicationIPS
Title: "Medication : Simvastatin 40 MG Disintegrating Oral Tablet"
Description: "Medication : Simvastatin 40 MG Disintegrating Oral Tablet"
Usage: #example
diff --git a/input/fsh/instances/medicationStatement-39-07-1.fsh b/input/fsh/instances/medicationStatement-39-07-1.fsh
index 37142922..42c0831d 100644
--- a/input/fsh/instances/medicationStatement-39-07-1.fsh
+++ b/input/fsh/instances/medicationStatement-39-07-1.fsh
@@ -1,5 +1,5 @@
Instance: eumfh-39-07-1-of-MedicationStatement
-InstanceOf: MedicationStatement
+InstanceOf: MedicationStatementIPS
Title: "MedicationStatement: on-going Simvastatin treatment"
Description: "MedicationStatement: on-going Simvastatin treatment"
Usage: #example
diff --git a/input/fsh/instances/observation-alcoholuse-1.fsh b/input/fsh/instances/observation-alcoholuse-1.fsh
index c5401dcb..c37b524a 100644
--- a/input/fsh/instances/observation-alcoholuse-1.fsh
+++ b/input/fsh/instances/observation-alcoholuse-1.fsh
@@ -1,5 +1,5 @@
Instance: alcohol-use-example
-InstanceOf: Observation
+InstanceOf: ObservationAlcoholUseUvIps
Title: "Observation: SH alcohol use example"
Description: "Observation: SH alcohol use example"
Usage: #example
diff --git a/input/fsh/instances/observation-hemoglobin.fsh b/input/fsh/instances/observation-hemoglobin.fsh
index 5309c1d7..afde3498 100644
--- a/input/fsh/instances/observation-hemoglobin.fsh
+++ b/input/fsh/instances/observation-hemoglobin.fsh
@@ -1,5 +1,5 @@
Instance: hemoglobin-of-Observation
-InstanceOf: Observation
+InstanceOf: ObservationResultsLaboratoryPathologyUvIps
Title: "Observation: hemoglobin example"
Description: "Observation: hemoglobin example"
Usage: #example
diff --git a/input/fsh/instances/observation-imaging-example-1.fsh b/input/fsh/instances/observation-imaging-example-1.fsh
index 05afaea7..e2a4800d 100644
--- a/input/fsh/instances/observation-imaging-example-1.fsh
+++ b/input/fsh/instances/observation-imaging-example-1.fsh
@@ -1,5 +1,5 @@
Instance: ips-example-imaging-1-of-Observation
-InstanceOf: Observation
+InstanceOf: ObservationResultsRadiologyUvIps
Title: "Observation: imaging CT Abdomen W contrast IV"
Description: "Observation: imaging CT Abdomen W contrast IV"
Usage: #example
diff --git a/input/fsh/instances/observation-imaging-example-4.fsh b/input/fsh/instances/observation-imaging-example-4.fsh
index fd7ca140..0a40e241 100644
--- a/input/fsh/instances/observation-imaging-example-4.fsh
+++ b/input/fsh/instances/observation-imaging-example-4.fsh
@@ -1,5 +1,5 @@
Instance: ips-example-imaging-4
-InstanceOf: Observation
+InstanceOf: ObservationResultsRadiologyUvIps
Title: "Observation: imaging CT Abdomen W contrast IV, sub-observations"
Description: "Observation: imaging CT Abdomen W contrast IV,sub-observations"
Usage: #example
diff --git a/input/fsh/instances/observation-pathology-cancer.fsh b/input/fsh/instances/observation-pathology-cancer.fsh
index b1c00628..efe3757d 100644
--- a/input/fsh/instances/observation-pathology-cancer.fsh
+++ b/input/fsh/instances/observation-pathology-cancer.fsh
@@ -1,5 +1,5 @@
Instance: pathology-cancer
-InstanceOf: Observation
+InstanceOf: ObservationResultsLaboratoryPathologyUvIps
Title: "Observation: estrogen receptor in tissue example"
Description: "Observation: estrogen receptor in tissue example"
Usage: #example
diff --git a/input/fsh/instances/observation-pregnancy-edd-1.fsh b/input/fsh/instances/observation-pregnancy-edd-1.fsh
index 67c8b9a0..d77def80 100644
--- a/input/fsh/instances/observation-pregnancy-edd-1.fsh
+++ b/input/fsh/instances/observation-pregnancy-edd-1.fsh
@@ -1,5 +1,5 @@
Instance: pregnancy-edd-example
-InstanceOf: Observation
+InstanceOf: ObservationPregnancyEddUvIps
Title: "Observation: pregnancy edd example"
Description: "Observation: pregnancy edd example"
Usage: #example
diff --git a/input/fsh/instances/observation-pregnancy-outcome-1.fsh b/input/fsh/instances/observation-pregnancy-outcome-1.fsh
index 7f441487..9ce23ea1 100644
--- a/input/fsh/instances/observation-pregnancy-outcome-1.fsh
+++ b/input/fsh/instances/observation-pregnancy-outcome-1.fsh
@@ -1,5 +1,5 @@
Instance: pregnancy-outcome-example
-InstanceOf: Observation
+InstanceOf: ObservationPregnancyOutcomeUvIps
Title: "Observation: pregnancy outcome example"
Description: "Observation: pregnancy outcome example"
Usage: #example
diff --git a/input/fsh/instances/observation-pregnancy-status-1.fsh b/input/fsh/instances/observation-pregnancy-status-1.fsh
index f36bd198..4fe02ba0 100644
--- a/input/fsh/instances/observation-pregnancy-status-1.fsh
+++ b/input/fsh/instances/observation-pregnancy-status-1.fsh
@@ -1,5 +1,5 @@
Instance: pregnancy-status-example
-InstanceOf: Observation
+InstanceOf: ObservationPregnancyStatusUvIps
Title: "Observation: pregnancy status example"
Description: "Observation: pregnancy status example"
Usage: #example
diff --git a/input/fsh/instances/observation-serum-creatinine-adult.fsh b/input/fsh/instances/observation-serum-creatinine-adult.fsh
index dbf97fcb..b23edb25 100644
--- a/input/fsh/instances/observation-serum-creatinine-adult.fsh
+++ b/input/fsh/instances/observation-serum-creatinine-adult.fsh
@@ -1,5 +1,5 @@
Instance: serum-creatinine-adult
-InstanceOf: Observation
+InstanceOf: ObservationResultsLaboratoryPathologyUvIps
Title: "Observation: serum creatinine example"
Description: "Observation: serum creatinine example"
Usage: #example
diff --git a/input/fsh/instances/observation-tobaccouse-1.fsh b/input/fsh/instances/observation-tobaccouse-1.fsh
index cf33f2df..2bf0ecf5 100644
--- a/input/fsh/instances/observation-tobaccouse-1.fsh
+++ b/input/fsh/instances/observation-tobaccouse-1.fsh
@@ -1,5 +1,5 @@
Instance: tobacco-use-example
-InstanceOf: Observation
+InstanceOf: ObservationTobaccoUseUvIps
Title: "Observation: SH tobacco use example"
Description: "Observation: SH tobacco use example"
Usage: #example
diff --git a/input/fsh/instances/observation-urine-wbc-range.fsh b/input/fsh/instances/observation-urine-wbc-range.fsh
index 2c0359d4..f6e5fcc6 100644
--- a/input/fsh/instances/observation-urine-wbc-range.fsh
+++ b/input/fsh/instances/observation-urine-wbc-range.fsh
@@ -1,5 +1,5 @@
Instance: urine-wbc-range
-InstanceOf: Observation
+InstanceOf: ObservationResultsLaboratoryPathologyUvIps
Title: "Observation: urine wbc range example"
Description: "Observation: urine wbc range example"
Usage: #example
diff --git a/input/fsh/instances/organization-imaging-example-1.fsh b/input/fsh/instances/organization-imaging-example-1.fsh
index 624b5080..6d4d2f2d 100644
--- a/input/fsh/instances/organization-imaging-example-1.fsh
+++ b/input/fsh/instances/organization-imaging-example-1.fsh
@@ -1,5 +1,5 @@
Instance: TII-Organization1
-InstanceOf: Organization
+InstanceOf: OrganizationUvIps
Title: "Organization: example"
Description: "Organization: example"
Usage: #example
diff --git a/input/fsh/instances/organization-lab-example-1.fsh b/input/fsh/instances/organization-lab-example-1.fsh
index 8c6276ab..845e945f 100644
--- a/input/fsh/instances/organization-lab-example-1.fsh
+++ b/input/fsh/instances/organization-lab-example-1.fsh
@@ -1,5 +1,5 @@
Instance: lab-org-example
-InstanceOf: Organization
+InstanceOf: OrganizationUvIps
Title: "Organization: lab example"
Description: "Best Hospital Lab Organization example"
Usage: #example
diff --git a/input/fsh/instances/patient-39-07-1.fsh b/input/fsh/instances/patient-39-07-1.fsh
index 52d58192..b72710d0 100644
--- a/input/fsh/instances/patient-39-07-1.fsh
+++ b/input/fsh/instances/patient-39-07-1.fsh
@@ -1,5 +1,5 @@
Instance: eumfh-39-07-of-Patient
-InstanceOf: Patient
+InstanceOf: PatientUvIps
Title: "Patient: male patient"
Description: "Patient: male patient"
Usage: #example
diff --git a/input/fsh/instances/patient-example-female.fsh b/input/fsh/instances/patient-example-female.fsh
index a0d3e75c..2c8da84f 100644
--- a/input/fsh/instances/patient-example-female.fsh
+++ b/input/fsh/instances/patient-example-female.fsh
@@ -1,5 +1,5 @@
Instance: patient-example-female
-InstanceOf: Patient
+InstanceOf: PatientUvIps
Title: "Patient: female patient"
Description: "Patient: female patient"
Usage: #example
diff --git a/input/fsh/instances/practictioner-39-07-1.fsh b/input/fsh/instances/practictioner-39-07-1.fsh
index f83cbca9..9dd339b9 100644
--- a/input/fsh/instances/practictioner-39-07-1.fsh
+++ b/input/fsh/instances/practictioner-39-07-1.fsh
@@ -1,5 +1,5 @@
Instance: eumfh-39-07-of-Practitioner
-InstanceOf: Practitioner
+InstanceOf: PractitionerUvIps
Title: "Practitioner example"
Description: "Practitioner example"
Usage: #example
diff --git a/input/fsh/instances/procedure-39-07-1.fsh b/input/fsh/instances/procedure-39-07-1.fsh
index bb7ed286..5d23eb5d 100644
--- a/input/fsh/instances/procedure-39-07-1.fsh
+++ b/input/fsh/instances/procedure-39-07-1.fsh
@@ -1,5 +1,5 @@
Instance: eumfh-39-07-1-of-Procedure
-InstanceOf: Procedure
+InstanceOf: ProcedureUvIps
Title: "Procedure: Surgical procedure"
Description: "Procedure: Surgical procedure"
Usage: #example
diff --git a/input/fsh/instances/specimen-example-1.fsh b/input/fsh/instances/specimen-example-1.fsh
index c38b4a81..fc3cebf8 100644
--- a/input/fsh/instances/specimen-example-1.fsh
+++ b/input/fsh/instances/specimen-example-1.fsh
@@ -1,5 +1,5 @@
Instance: specimen-example-1
-InstanceOf: Specimen
+InstanceOf: SpecimenUvIps
Title: "Specimen: example"
Description: "Specimen: example"
Usage: #example
diff --git a/sushi-config.yaml b/sushi-config.yaml
index cc795aef..abafac88 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -41,168 +41,169 @@ menu:
Downloads: downloads.html
Copyrights: copyrights.html
Change Log: changes.html
-resources:
- Bundle/IPS-examples-Bundle-01:
- name: 'IPS Bundle example'
- description: 'IPS Bundle example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips
- Bundle/IPS-examples-Bundle-with-immunization:
- name: 'IPS Bundle example with Immunization'
- description: 'IPS Bundle example with Immunization section'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips
- Bundle/bundle-no-info-required-sections:
- name: 'IPS Bundle example - no information in required sections'
- description: 'IPS Bundle example - no information in required sections'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips
- Bundle/bundle-minimal:
- name: 'IPS Bundle example - minimal'
- description: 'IPS Bundle example - minimal'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips
- Composition/composition-minimal:
- name: 'IPS Composition example - minimal'
- description: 'IPS Composition example - minimal'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Composition-uv-ips
- Medication/eumfh-39-07-1:
- name: 'Medication : Simvastatin 40 MG Disintegrating Oral Tablet'
- description: 'Medication : Simvastatin 40 MG Disintegrating Oral Tablet'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Medication-uv-ips
- MedicationStatement/eumfh-39-07-1:
- name: 'MedicationStatement: on-going Simvastatin treatment'
- description: 'MedicationStatement: on-going Simvastatin treatment'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/MedicationStatement-uv-ips
- MedicationRequest/eumfh-39-07-1-request:
- name: 'MedicationRequest: Simvastatin request'
- description: 'MedicationRequest: Simvastatin request'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/MedicationRequest-uv-ips
- Immunization/75680:
- name: 'Immunization: Vaccin anti diphtérie-coqueluche-tétanos-poliomyélite (Luxembourg)'
- description: 'Immunization: Vaccin anti diphtérie-coqueluche-tétanos-poliomyélite (Luxembourg)'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Immunization-uv-ips
- AllergyIntolerance/eumfh-39-07-1:
- name: 'AllergyIntolerance: No known allergies'
- description: 'AllergyIntolerance: No known allergies'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/AllergyIntolerance-uv-ips
- AllergyIntolerance/allergyintolerance-with-abatement:
- name: 'AllergyIntolerance: resolved allergy'
- description: 'AllergyIntolerance: resolved allergy'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/AllergyIntolerance-uv-ips
- AllergyIntolerance/allergyintolerance-multiple-codings:
- name: 'AllergyIntolerance: multiple codings'
- description: 'AllergyIntolerance: multiple codings'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/AllergyIntolerance-uv-ips
- Condition/eumfh-39-07-1:
- name: 'Condition: Acute myocardial infarction of anterior wall'
- description: 'Condition: Acute myocardial infarction of anterior wall'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Condition-uv-ips
- Procedure/eumfh-39-07-1:
- name: 'Procedure: Surgical procedure'
- description: 'Procedure: Surgical procedure'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Procedure-uv-ips
- Practitioner/eumfh-39-07:
- name: 'Practitioner example'
- description: 'Practitioner example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Practitioner-uv-ips
- PractitionerRole/simple-pr:
- name: 'PractitionerRole: simple example'
- description: 'Very Simple PractitionerRole example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/PractitionerRole-uv-ips
- Patient/eumfh-39-07:
- name: 'Patient: male patient'
- description: 'Patient: male patient'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Patient-uv-ips
- Patient/66033:
- name: 'Patient: minimal example'
- description: 'Patient: minimal example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Patient-uv-ips
- Patient/patient-example-female:
- name: 'Patient: female patient'
- description: 'Patient: female patient'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Patient-uv-ips
- DeviceUseStatement/eumfh-70-275-1:
- name: 'DeviceUseStatement: No known devices in use'
- description: 'DeviceUseStatement: No known devices in use'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/DeviceUseStatement-uv-ips
- Device/eumfh-70-275-1:
- name: 'Device: No known devices in use'
- description: 'Device: No known devices in use'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Device-uv-ips
- Device/ips-example-imaging-1:
- name: 'Device: device observer example'
- description: 'Device: device observer example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Device-observer-uv-ips
- Observation/ips-example-imaging-1:
- name: 'Observation: imaging CT Abdomen W contrast IV'
- description: 'Observation: imaging CT Abdomen W contrast IV'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-radiology-uv-ips
- Observation/ips-example-imaging-4:
- name: 'Observation: imaging CT Abdomen W contrast IV, sub-observations'
- description: 'Observation: imaging CT Abdomen W contrast IV,sub-observations'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-radiology-uv-ips
- Observation/ips-example-imaging-5:
- name: 'Observation: imaging Chest X-ray - PA and lateral, with additional sub-observation including numeric range'
- description: 'Observation: imaging Chest X-ray - PA and lateral, with additional sub-observation including numeric range'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-radiology-uv-ips
- ImagingStudy/TII-ImagingStudy-5-1:
- name: 'ImagingStudy: referred DICOM study'
- description: 'ImagingStudy: referred DICOM study'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/ImagingStudy-uv-ips
- Organization/TII-Organization1:
- name: 'Organization: example'
- description: 'Organization: example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Organization-uv-ips
- Organization/simple-org:
- name: 'Organization: simple example'
- description: 'Very Simple Organization example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Organization-uv-ips
- Organization/lab-org-example:
- name: 'Organization: lab example'
- description: 'Best Hospital Lab Organization example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Organization-uv-ips
- Observation/pregnancy-edd-example:
- name: 'Observation: pregnancy edd example'
- description: 'Observation: pregnancy edd example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-pregnancy-edd-uv-ips
- Observation/pregnancy-status-example:
- name: 'Observation: pregnancy status example'
- description: 'Observation: pregnancy status example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-pregnancy-status-uv-ips
- Observation/pregnancy-outcome-example:
- name: 'Observation: pregnancy outcome example'
- description: 'Observation: pregnancy outcome example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-pregnancy-outcome-uv-ips
- Observation/tobacco-use-example:
- name: 'Observation: SH tobacco use example'
- description: 'Observation: SH tobacco use example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-tobaccouse-uv-ips
- Observation/alcohol-use-example:
- name: 'Observation: SH alcohol use example'
- description: 'Observation: SH alcohol use example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-alcoholuse-uv-ips
- Specimen/specimen-example-1:
- name: 'Specimen: example'
- description: 'Specimen: example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Specimen-uv-ips
- Observation/serum-creatinine-adult:
- name: 'Observation: serum creatinine example'
- description: 'Observation: serum creatinine example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips
- Observation/hemoglobin:
- name: 'Observation: hemoglobin example'
- description: 'Observation: hemoglobin example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips
- Observation/urine-wbc-range:
- name: 'Observation: urine wbc range example'
- description: 'Observation: urine wbc range example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips
- Observation/pathology-cancer:
- name: 'Observation: estrogen receptor in tissue example'
- description: 'Observation: estrogen receptor in tissue example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips
- DiagnosticReport/hemoglobin:
- name: 'DiagnosticReport: hemoglobin example'
- description: 'DiagnosticReport: hemoglobin example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/DiagnosticReport-uv-ips
- Flag/546482:
- name: 'Alert Flag (IPS) example'
- description: 'Alert Flag (IPS) example'
- exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Flag-alert-uv-ips
+
+# resources:
+# Bundle/IPS-examples-Bundle-01:
+# name: 'IPS Bundle example'
+# description: 'IPS Bundle example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips
+# Bundle/IPS-examples-Bundle-with-immunization:
+# name: 'IPS Bundle example with Immunization'
+# description: 'IPS Bundle example with Immunization section'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips
+# Bundle/bundle-no-info-required-sections:
+# name: 'IPS Bundle example - no information in required sections'
+# description: 'IPS Bundle example - no information in required sections'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips
+# Bundle/bundle-minimal:
+# name: 'IPS Bundle example - minimal'
+# description: 'IPS Bundle example - minimal'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips
+# Composition/composition-minimal:
+# name: 'IPS Composition example - minimal'
+# description: 'IPS Composition example - minimal'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Composition-uv-ips
+# Medication/eumfh-39-07-1:
+# name: 'Medication : Simvastatin 40 MG Disintegrating Oral Tablet'
+# description: 'Medication : Simvastatin 40 MG Disintegrating Oral Tablet'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Medication-uv-ips
+# MedicationStatement/eumfh-39-07-1:
+# name: 'MedicationStatement: on-going Simvastatin treatment'
+# description: 'MedicationStatement: on-going Simvastatin treatment'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/MedicationStatement-uv-ips
+# MedicationRequest/eumfh-39-07-1-request:
+# name: 'MedicationRequest: Simvastatin request'
+# description: 'MedicationRequest: Simvastatin request'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/MedicationRequest-uv-ips
+# Immunization/75680:
+# name: 'Immunization: Vaccin anti diphtérie-coqueluche-tétanos-poliomyélite (Luxembourg)'
+# description: 'Immunization: Vaccin anti diphtérie-coqueluche-tétanos-poliomyélite (Luxembourg)'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Immunization-uv-ips
+# AllergyIntolerance/eumfh-39-07-1:
+# name: 'AllergyIntolerance: No known allergies'
+# description: 'AllergyIntolerance: No known allergies'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/AllergyIntolerance-uv-ips
+# AllergyIntolerance/allergyintolerance-with-abatement:
+# name: 'AllergyIntolerance: resolved allergy'
+# description: 'AllergyIntolerance: resolved allergy'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/AllergyIntolerance-uv-ips
+# AllergyIntolerance/allergyintolerance-multiple-codings:
+# name: 'AllergyIntolerance: multiple codings'
+# description: 'AllergyIntolerance: multiple codings'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/AllergyIntolerance-uv-ips
+# Condition/eumfh-39-07-1:
+# name: 'Condition: Acute myocardial infarction of anterior wall'
+# description: 'Condition: Acute myocardial infarction of anterior wall'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Condition-uv-ips
+# Procedure/eumfh-39-07-1:
+# name: 'Procedure: Surgical procedure'
+# description: 'Procedure: Surgical procedure'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Procedure-uv-ips
+# Practitioner/eumfh-39-07:
+# name: 'Practitioner example'
+# description: 'Practitioner example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Practitioner-uv-ips
+# PractitionerRole/simple-pr:
+# name: 'PractitionerRole: simple example'
+# description: 'Very Simple PractitionerRole example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/PractitionerRole-uv-ips
+# Patient/eumfh-39-07:
+# name: 'Patient: male patient'
+# description: 'Patient: male patient'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Patient-uv-ips
+# Patient/66033:
+# name: 'Patient: minimal example'
+# description: 'Patient: minimal example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Patient-uv-ips
+# Patient/patient-example-female:
+# name: 'Patient: female patient'
+# description: 'Patient: female patient'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Patient-uv-ips
+# DeviceUseStatement/eumfh-70-275-1:
+# name: 'DeviceUseStatement: No known devices in use'
+# description: 'DeviceUseStatement: No known devices in use'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/DeviceUseStatement-uv-ips
+# Device/eumfh-70-275-1:
+# name: 'Device: No known devices in use'
+# description: 'Device: No known devices in use'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Device-uv-ips
+# Device/ips-example-imaging-1:
+# name: 'Device: device observer example'
+# description: 'Device: device observer example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Device-observer-uv-ips
+# Observation/ips-example-imaging-1:
+# name: 'Observation: imaging CT Abdomen W contrast IV'
+# description: 'Observation: imaging CT Abdomen W contrast IV'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-radiology-uv-ips
+# Observation/ips-example-imaging-4:
+# name: 'Observation: imaging CT Abdomen W contrast IV, sub-observations'
+# description: 'Observation: imaging CT Abdomen W contrast IV,sub-observations'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-radiology-uv-ips
+# Observation/ips-example-imaging-5:
+# name: 'Observation: imaging Chest X-ray - PA and lateral, with additional sub-observation including numeric range'
+# description: 'Observation: imaging Chest X-ray - PA and lateral, with additional sub-observation including numeric range'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-radiology-uv-ips
+# ImagingStudy/TII-ImagingStudy-5-1:
+# name: 'ImagingStudy: referred DICOM study'
+# description: 'ImagingStudy: referred DICOM study'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/ImagingStudy-uv-ips
+# Organization/TII-Organization1:
+# name: 'Organization: example'
+# description: 'Organization: example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Organization-uv-ips
+# Organization/simple-org:
+# name: 'Organization: simple example'
+# description: 'Very Simple Organization example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Organization-uv-ips
+# Organization/lab-org-example:
+# name: 'Organization: lab example'
+# description: 'Best Hospital Lab Organization example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Organization-uv-ips
+# Observation/pregnancy-edd-example:
+# name: 'Observation: pregnancy edd example'
+# description: 'Observation: pregnancy edd example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-pregnancy-edd-uv-ips
+# Observation/pregnancy-status-example:
+# name: 'Observation: pregnancy status example'
+# description: 'Observation: pregnancy status example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-pregnancy-status-uv-ips
+# Observation/pregnancy-outcome-example:
+# name: 'Observation: pregnancy outcome example'
+# description: 'Observation: pregnancy outcome example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-pregnancy-outcome-uv-ips
+# Observation/tobacco-use-example:
+# name: 'Observation: SH tobacco use example'
+# description: 'Observation: SH tobacco use example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-tobaccouse-uv-ips
+# Observation/alcohol-use-example:
+# name: 'Observation: SH alcohol use example'
+# description: 'Observation: SH alcohol use example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-alcoholuse-uv-ips
+# Specimen/specimen-example-1:
+# name: 'Specimen: example'
+# description: 'Specimen: example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Specimen-uv-ips
+# Observation/serum-creatinine-adult:
+# name: 'Observation: serum creatinine example'
+# description: 'Observation: serum creatinine example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips
+# Observation/hemoglobin:
+# name: 'Observation: hemoglobin example'
+# description: 'Observation: hemoglobin example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips
+# Observation/urine-wbc-range:
+# name: 'Observation: urine wbc range example'
+# description: 'Observation: urine wbc range example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips
+# Observation/pathology-cancer:
+# name: 'Observation: estrogen receptor in tissue example'
+# description: 'Observation: estrogen receptor in tissue example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips
+# DiagnosticReport/hemoglobin:
+# name: 'DiagnosticReport: hemoglobin example'
+# description: 'DiagnosticReport: hemoglobin example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/DiagnosticReport-uv-ips
+# Flag/546482:
+# name: 'Alert Flag (IPS) example'
+# description: 'Alert Flag (IPS) example'
+# exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Flag-alert-uv-ips