diff --git a/_unused/FHIRCommon.fsh b/_unused/FHIRCommon.fsh
index 9b424c3e92..e50a8b5f09 100644
--- a/_unused/FHIRCommon.fsh
+++ b/_unused/FHIRCommon.fsh
@@ -5,12 +5,12 @@ Description: "This library defines terminologies and functions commonly used in
 Usage: #definition
 * url = "http://fhir.org/guides/cqf/common/Library/FHIRCommon"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * version = "4.0.1"
 * name = "FHIRCommon"
 * status = #draft
-* experimental = false
+* experimental = true
 * publisher = "World Health Organization (WHO)"
 * type = $library-type#logic-library
 * content.id = "ig-loader-FHIRCommon.cql"
\ No newline at end of file
diff --git a/_unused/FHIRHelpers.fsh b/_unused/FHIRHelpers.fsh
index 5d20086fd4..ec1e832846 100644
--- a/_unused/FHIRHelpers.fsh
+++ b/_unused/FHIRHelpers.fsh
@@ -5,12 +5,12 @@ Description: "This library defines functions to convert between FHIR data types
 Usage: #definition
 * url = "http://fhir.org/guides/cqf/common/Library/FHIRHelpers"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * version = "4.0.1"
 * name = "FHIRHelpers"
 * status = #draft
-* experimental = false
+* experimental = true
 * publisher = "World Health Organization (WHO)"
 * type = $library-type#logic-library
 * content.id = "ig-loader-FHIRHelpers.cql"
\ No newline at end of file
diff --git a/input/_resources/exp-params.json b/input/_resources/exp-params.json
new file mode 100644
index 0000000000..01407ed8fd
--- /dev/null
+++ b/input/_resources/exp-params.json
@@ -0,0 +1,8 @@
+{
+    "resourceType" : "Parameters",
+    "id" : "exp-params",
+    "parameter" : [{
+      "name" : "system-version",
+      "valueUri" : "http://snomed.info/sct|http://snomed.info/sct/900000000000207008"
+    }]
+  }
\ No newline at end of file
diff --git a/input/fsh/activitydefinitions/IMMZD2DTMeaslesCIMR.fsh b/input/fsh/activitydefinitions/IMMZD2DTMeaslesCIMR.fsh
index a5668a7303..a06385dc47 100644
--- a/input/fsh/activitydefinitions/IMMZD2DTMeaslesCIMR.fsh
+++ b/input/fsh/activitydefinitions/IMMZD2DTMeaslesCIMR.fsh
@@ -6,7 +6,7 @@ Usage: #definition
 
 * library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesLogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesContraindication"
 * status = #draft
diff --git a/input/fsh/activitydefinitions/IMMZD2DTMeaslesEval.fsh b/input/fsh/activitydefinitions/IMMZD2DTMeaslesEval.fsh
index 1d519f19ef..152b71b1ac 100644
--- a/input/fsh/activitydefinitions/IMMZD2DTMeaslesEval.fsh
+++ b/input/fsh/activitydefinitions/IMMZD2DTMeaslesEval.fsh
@@ -6,7 +6,7 @@ Usage: #definition
 
 * library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesLogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesContraindicationEvaluation"
 * status = #draft
diff --git a/input/fsh/activitydefinitions/IMMZD2DTMeaslesMR.fsh b/input/fsh/activitydefinitions/IMMZD2DTMeaslesMR.fsh
index b9a0252242..336ec9db9a 100644
--- a/input/fsh/activitydefinitions/IMMZD2DTMeaslesMR.fsh
+++ b/input/fsh/activitydefinitions/IMMZD2DTMeaslesMR.fsh
@@ -6,7 +6,7 @@ Usage: #definition
 
 * library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesLogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesMedicationRequest"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZCommon.fsh b/input/fsh/libraries/IMMZCommon.fsh
index a08a975ed2..acaae3d2fc 100644
--- a/input/fsh/libraries/IMMZCommon.fsh
+++ b/input/fsh/libraries/IMMZCommon.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZCommon"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZCommon"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZConcepts.fsh b/input/fsh/libraries/IMMZConcepts.fsh
index a69dcba936..28ece082ca 100644
--- a/input/fsh/libraries/IMMZConcepts.fsh
+++ b/input/fsh/libraries/IMMZConcepts.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZConcepts"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZConcepts"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZConfig.fsh b/input/fsh/libraries/IMMZConfig.fsh
index 4d719d3b17..f974e5c75b 100644
--- a/input/fsh/libraries/IMMZConfig.fsh
+++ b/input/fsh/libraries/IMMZConfig.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZConfig"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZConfig"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZD2DTMeaslesDose0Logic.fsh b/input/fsh/libraries/IMMZD2DTMeaslesDose0Logic.fsh
index ef4802f556..968e362867 100644
--- a/input/fsh/libraries/IMMZD2DTMeaslesDose0Logic.fsh
+++ b/input/fsh/libraries/IMMZD2DTMeaslesDose0Logic.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesDose0Logic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesDose0Logic"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZD2DTMeaslesLTLogic.fsh b/input/fsh/libraries/IMMZD2DTMeaslesLTLogic.fsh
index 6c55e1a5d1..c896eccff8 100644
--- a/input/fsh/libraries/IMMZD2DTMeaslesLTLogic.fsh
+++ b/input/fsh/libraries/IMMZD2DTMeaslesLTLogic.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesLTLogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesLTLogic"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZD2DTMeaslesLogic.fsh b/input/fsh/libraries/IMMZD2DTMeaslesLogic.fsh
index f5acc03ddc..752285b6b8 100644
--- a/input/fsh/libraries/IMMZD2DTMeaslesLogic.fsh
+++ b/input/fsh/libraries/IMMZD2DTMeaslesLogic.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesLogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesLogic"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZD2DTMeaslesOTLogic.fsh b/input/fsh/libraries/IMMZD2DTMeaslesOTLogic.fsh
index fc66ed67dd..2cbfabe826 100644
--- a/input/fsh/libraries/IMMZD2DTMeaslesOTLogic.fsh
+++ b/input/fsh/libraries/IMMZD2DTMeaslesOTLogic.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesOTLogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesOTLogic"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZD2DTMeaslesSupplementaryLogic.fsh b/input/fsh/libraries/IMMZD2DTMeaslesSupplementaryLogic.fsh
index 9db916d4c1..752f996825 100644
--- a/input/fsh/libraries/IMMZD2DTMeaslesSupplementaryLogic.fsh
+++ b/input/fsh/libraries/IMMZD2DTMeaslesSupplementaryLogic.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesSupplementaryLogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesSupplementaryLogic"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZD5DTMeaslesCILogic.fsh b/input/fsh/libraries/IMMZD5DTMeaslesCILogic.fsh
index bfa8076948..5ab99c4e3a 100644
--- a/input/fsh/libraries/IMMZD5DTMeaslesCILogic.fsh
+++ b/input/fsh/libraries/IMMZD5DTMeaslesCILogic.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZD5DTMeaslesCILogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD5DTMeaslesCILogic"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZElements.fsh b/input/fsh/libraries/IMMZElements.fsh
index 06a526842c..f37a5d47d9 100644
--- a/input/fsh/libraries/IMMZElements.fsh
+++ b/input/fsh/libraries/IMMZElements.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZElements"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZElements"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZEncounterElements.fsh b/input/fsh/libraries/IMMZEncounterElements.fsh
index df10b5b98c..03b874afbe 100644
--- a/input/fsh/libraries/IMMZEncounterElements.fsh
+++ b/input/fsh/libraries/IMMZEncounterElements.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZEncounterElements"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZEncounterElements"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZIND08Logic.fsh b/input/fsh/libraries/IMMZIND08Logic.fsh
index 70fc824b0c..fc8d0b2356 100644
--- a/input/fsh/libraries/IMMZIND08Logic.fsh
+++ b/input/fsh/libraries/IMMZIND08Logic.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZIND08Logic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZIND08Logic"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZIND12Logic.fsh b/input/fsh/libraries/IMMZIND12Logic.fsh
index adc8312f08..0866956bd1 100644
--- a/input/fsh/libraries/IMMZIND12Logic.fsh
+++ b/input/fsh/libraries/IMMZIND12Logic.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZIND12Logic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZIND12Logic"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZIND13Logic.fsh b/input/fsh/libraries/IMMZIND13Logic.fsh
index d002826120..bfb44ad748 100644
--- a/input/fsh/libraries/IMMZIND13Logic.fsh
+++ b/input/fsh/libraries/IMMZIND13Logic.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZIND13Logic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZIND13Logic"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZIndicatorElements.fsh b/input/fsh/libraries/IMMZIndicatorElements.fsh
index 625458b57a..9af8f983fe 100644
--- a/input/fsh/libraries/IMMZIndicatorElements.fsh
+++ b/input/fsh/libraries/IMMZIndicatorElements.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZIndicatorElements"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZIndicatorElements"
 * status = #draft
diff --git a/input/fsh/libraries/IMMZVaccineLibrary.fsh b/input/fsh/libraries/IMMZVaccineLibrary.fsh
index fa4e448576..4a666d8bc4 100644
--- a/input/fsh/libraries/IMMZVaccineLibrary.fsh
+++ b/input/fsh/libraries/IMMZVaccineLibrary.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/immunizations-measles/Library/IMMZVaccineLibrary"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZVaccineLibrary"
 * status = #draft
diff --git a/input/fsh/libraries/WHOCommon.fsh b/input/fsh/libraries/WHOCommon.fsh
index f9e5b2c532..e4adf537a2 100644
--- a/input/fsh/libraries/WHOCommon.fsh
+++ b/input/fsh/libraries/WHOCommon.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/base-clinical/Library/WHOCommon"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * version = "0.1.0"
 * name = "WHOCommon"
diff --git a/input/fsh/libraries/WHOConcepts.fsh b/input/fsh/libraries/WHOConcepts.fsh
index 85ed124687..cf0a82de54 100644
--- a/input/fsh/libraries/WHOConcepts.fsh
+++ b/input/fsh/libraries/WHOConcepts.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/base-clinical/Library/WHOConcepts"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * version = "0.1.0"
 * name = "WHOConcepts"
diff --git a/input/fsh/libraries/WHOElements.fsh b/input/fsh/libraries/WHOElements.fsh
index e9d6eb2226..55da74db8c 100644
--- a/input/fsh/libraries/WHOElements.fsh
+++ b/input/fsh/libraries/WHOElements.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/base-clinical/Library/WHOElements"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * version = "0.1.0"
 * name = "WHOElements"
diff --git a/input/fsh/libraries/WHOEncounterElements.fsh b/input/fsh/libraries/WHOEncounterElements.fsh
index e467bc2246..b8342e9db1 100644
--- a/input/fsh/libraries/WHOEncounterElements.fsh
+++ b/input/fsh/libraries/WHOEncounterElements.fsh
@@ -9,7 +9,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
 * url = "http://smart.who.int/base-clinical/Library/WHOEncounterElements"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * version = "0.1.0"
 * name = "WHOEncounterElements"
diff --git a/input/fsh/measures/IMMZIND08.fsh b/input/fsh/measures/IMMZIND08.fsh
index 320505bb50..214a07f988 100644
--- a/input/fsh/measures/IMMZIND08.fsh
+++ b/input/fsh/measures/IMMZIND08.fsh
@@ -35,9 +35,9 @@ Title: "IMMZ.IND.08 Immunization coverage for Measles containing vaccine (Estima
     * id = "IMMZ.IND.08.MO"
     * description = "Measure Observation"
     * code = $measure-population#measure-observation
-    * criteria.language = #text/identifier
+    * criteria.language = #text/cql-identifier
     * criteria.expression = "Measure Observation"
   * stratifier[+]
     * id = "IMMZ.IND.08.S"
-    * criteria.language = #text/identifier
+    * criteria.language = #text/cql-identifier
     * criteria.expression = "Stratification"
\ No newline at end of file
diff --git a/input/fsh/plandefinitions/IMMZD2DTMeaslesDose0.fsh b/input/fsh/plandefinitions/IMMZD2DTMeaslesDose0.fsh
index 90a67a1c14..78b4932cd6 100644
--- a/input/fsh/plandefinitions/IMMZD2DTMeaslesDose0.fsh
+++ b/input/fsh/plandefinitions/IMMZD2DTMeaslesDose0.fsh
@@ -8,7 +8,7 @@ Usage: #definition
 
 * library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesDose0Logic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * url = "http://smart.who.int/immunizations-measles/PlanDefinition/IMMZD2DTMeaslesDose0"
 * name = "IMMZD2DTMeaslesDose0"
diff --git a/input/fsh/plandefinitions/IMMZD2DTMeaslesLT.fsh b/input/fsh/plandefinitions/IMMZD2DTMeaslesLT.fsh
index 6fd7aeef8c..b5b6e283b4 100644
--- a/input/fsh/plandefinitions/IMMZD2DTMeaslesLT.fsh
+++ b/input/fsh/plandefinitions/IMMZD2DTMeaslesLT.fsh
@@ -8,7 +8,7 @@ Usage: #definition
 
 * library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesLTLogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * url = "http://smart.who.int/immunizations-measles/PlanDefinition/IMMZD2DTMeaslesLT"
 * name = "IMMZD2DTMeaslesLT"
diff --git a/input/fsh/plandefinitions/IMMZD2DTMeaslesOT.fsh b/input/fsh/plandefinitions/IMMZD2DTMeaslesOT.fsh
index 0237d5bce1..b8d4d4b315 100644
--- a/input/fsh/plandefinitions/IMMZD2DTMeaslesOT.fsh
+++ b/input/fsh/plandefinitions/IMMZD2DTMeaslesOT.fsh
@@ -8,7 +8,7 @@ Usage: #definition
 
 * library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesOTLogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * url = "http://smart.who.int/immunizations-measles/PlanDefinition/IMMZD2DTMeaslesOT"
 * name = "IMMZD2DTMeaslesOT"
diff --git a/input/fsh/plandefinitions/IMMZD2DTMeaslesSupplementary.fsh b/input/fsh/plandefinitions/IMMZD2DTMeaslesSupplementary.fsh
index d0cb127f51..53b3512e4e 100644
--- a/input/fsh/plandefinitions/IMMZD2DTMeaslesSupplementary.fsh
+++ b/input/fsh/plandefinitions/IMMZD2DTMeaslesSupplementary.fsh
@@ -8,7 +8,7 @@ Usage: #definition
 
 * library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesSupplementaryLogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * url = "http://smart.who.int/immunizations-measles/PlanDefinition/IMMZD2DTMeaslesSupplementary"
 * name = "IMMZD2DTMeaslesSupplementary"
diff --git a/input/fsh/plandefinitions/IMMZD5DTMeaslesCI.fsh b/input/fsh/plandefinitions/IMMZD5DTMeaslesCI.fsh
index 72e63e4dfc..dfd0f8e39b 100644
--- a/input/fsh/plandefinitions/IMMZD5DTMeaslesCI.fsh
+++ b/input/fsh/plandefinitions/IMMZD5DTMeaslesCI.fsh
@@ -8,7 +8,7 @@ Usage: #definition
 
 * library = "http://smart.who.int/immunizations-measles/Library/IMMZD5DTMeaslesCILogic"
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * url = "http://smart.who.int/immunizations-measles/PlanDefinition/IMMZD5DTMeaslesCI"
 * name = "IMMZD5DTMeaslesContraindication"
diff --git a/input/fsh/plandefinitions/IMMZDTImmunizationStrategy.fsh b/input/fsh/plandefinitions/IMMZDTImmunizationStrategy.fsh
index 2547b78b85..e2fdf90621 100644
--- a/input/fsh/plandefinitions/IMMZDTImmunizationStrategy.fsh
+++ b/input/fsh/plandefinitions/IMMZDTImmunizationStrategy.fsh
@@ -7,7 +7,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishableplandefinition"
 
 * extension[+]
-  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable
 * url = "http://smart.who.int/immunizations-measles/PlanDefinition/IMMZDTImmunizationStrategy"
 * name = "IMMZDTImmunizationStrategy"
diff --git a/sushi-config.yaml b/sushi-config.yaml
index 98e0e1fcfc..f64c7b725f 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -27,7 +27,7 @@ publisher:
 #
 dependencies:
   hl7.terminology: 5.5.0
-  hl7.fhir.uv.extensions: 5.1.0
+  hl7.fhir.uv.extensions.r4: 5.1.0
   hl7.fhir.uv.cql: 1.0.0
   hl7.fhir.uv.crmi: 1.0.0
   hl7.fhir.uv.sdc: 3.0.0
@@ -303,6 +303,8 @@ meta:
 
 parameters:
   produce-jekyll-data: true
+  path-expansion-params:
+    - ../../input/_resources/exp-params.json
   path-resource: 
     - input/actors
     - input/maps
@@ -312,7 +314,7 @@ parameters:
     - http://id.who.int/icd/release/11/mms
     - http://hl7.org/fhir/ValueSet/immunization-status
     - http://hl7.org/fhir/ValueSet/country
-    - http://smart.who.int/immunizations-measles/Library/WHOCommon
-    - http://smart.who.int/immunizations-measles/Library/WHOConcepts
-    - http://smart.who.int/immunizations-measles/Library/WHOElements
+    - http://smart.who.int/base-clinical/Library/WHOCommon
+    - http://smart.who.int/base-clinical/Library/WHOConcepts
+    - http://smart.who.int/base-clinical/Library/WHOElements
     - http://smart.who.int/base-clinical/Library/WHOEncounterElements