diff --git a/input/fsh/definitions/measles.fsh b/input/fsh/definitions/measles.fsh
new file mode 100644
index 0000000000..6ccdc170e0
--- /dev/null
+++ b/input/fsh/definitions/measles.fsh
@@ -0,0 +1,73 @@
+Instance: IMMZDT08Measles
+InstanceOf: http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-recommendationdefinition
+Title: "IMMZ.DT.08.Measles"
+Description: "If the child or patient has not been given MCV1 (at 9 months) and MCV2 (between 15-18 months) vaccination"
+Usage: #definition
+
+* library = "http://fhir.org/guides/who/smart-immunization/Library/IMMZDT08"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * valueCode = #computable
+* version = "0.1.0"
+* name = "IMMZDT08Measles"
+* status = #draft
+* experimental = false
+* publisher = "World Health Organization (WHO)"
+* action[+]
+  * title = "Immunize patient for Measles"
+  * description = "Provide measles immunization"
+  * condition[+]
+    * kind = #applicability
+    * expression
+      * description = "Provision of the MCV dose"
+      * language = #text/cql-identifier
+      * expression = "Provision of the MCV dose"
+  * definitionCanonical = Canonical(IMMZDT08MeaslesMR)
+
+
+Instance: IMMZDT08MeaslesMR
+InstanceOf: http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-medicationrequestactivity
+Title: "IMMZ.DT.08.Measles.MR"
+Description: "Provide measles immunization"
+Usage: #definition
+
+* library = "http://fhir.org/guides/who/smart-immunization/Library/IMMZDT08"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * valueCode = #computable
+* version = "0.1.0"
+* name = "IMMZDT08MeaslesMR"
+* status = #draft
+* experimental = false
+* date = 2023-10-03
+* publisher = "World Health Organization (WHO)"
+* contact[+]
+  * telecom[+]
+    * system = #url
+    * value = "https://who.int"
+* kind = #MedicationRequest
+* intent = #proposal
+* doNotPerform = false
+* productCodeableConcept = $ICD11#XM28X5 "Measles vaccines"
+* dynamicValue[+]
+  * path = "status"
+  * expression
+    * language = #text/cql
+    * expression = "'draft'"
+* dynamicValue[+]
+  * path = "intent"
+  * expression
+    * language = #text/cql
+    * expression = "'proposal'"
+* dynamicValue[+]
+  * path = "dispenseRequest.validityPeriod.start"
+  * expression
+    * description = "Due date of the dose"
+    * language = #text/cql-identifier
+    * expression = "Schedule Due Date for MCV dose"
+* dynamicValue[+]
+  * path = "dispenseRequest.validityPeriod.end"
+  * expression
+    * description = "Expiration date for MCV dose"
+    * language = #text/cql-identifier
+    * expression = "Expiration Date for MCV dose"
\ No newline at end of file
diff --git a/input/fsh/definitions/umbrella.fsh b/input/fsh/definitions/umbrella.fsh
new file mode 100644
index 0000000000..a42d1b56fe
--- /dev/null
+++ b/input/fsh/definitions/umbrella.fsh
@@ -0,0 +1,25 @@
+Instance: IMMZDTUmbrella
+InstanceOf: http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-strategydefinition
+Title: "IMMZ.DT.Umbrella"
+Description: "If the child or patient has not been given MCV1 (at 9 months) and MCV2 (between 15-18 months) vaccination"
+Usage: #definition
+
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
+  * valueCode = #computable
+* version = "0.1.0"
+* name = "IMMZDTUmbrella"
+* status = #draft
+* experimental = false
+* publisher = "World Health Organization (WHO)"
+* action[+]
+  * title = "Check Immunizations"
+  * description = "Check immunization plan definitions to see what is required."
+  * code = http://hl7.org/fhir/uv/cpg/CodeSystem/cpg-common-process-cs#dispense-medications
+  * selectionBehavior = #all
+  * action[+]
+    * title = "Immunize patient for Measles"
+    * description = "Provide measles immunization"
+    * code = http://hl7.org/fhir/uv/cpg/CodeSystem/cpg-common-process-cs#dispense-medications
+    * selectionBehavior = #all
+    * definitionCanonical = Canonical(IMMZDT08Measles)
\ No newline at end of file
diff --git a/input/resources/activitydefinition/IMMZ.DT.08.Measles.MR.json b/input/resources/activitydefinition/IMMZ.DT.08.Measles.MR.json
deleted file mode 100644
index 90169d0aa1..0000000000
--- a/input/resources/activitydefinition/IMMZ.DT.08.Measles.MR.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "resourceType": "ActivityDefinition",
-  "id": "IMMZ.DT.08.Measles.MR",
-  "url": "http://fhir.org/guides/who/smart-immunization/ActivityDefinition/IMMZ.DT.08.Measles.MR",
-  "version": "0.1.0",
-  "title": "IMMZ.DT.08.Measles.MR",
-  "status": "active",
-  "experimental": true,
-  "date": "2022-05-06T12:05:48.3799313-04:00",
-  "publisher": "World Health Organization (WHO)",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://who.int"
-        }
-      ]
-    }
-  ],
-  "description": "Provide measles immunization",
-  "library": [
-    "http://fhir.org/guides/who/smart-immunization/Library/IMMZDT08"
-  ],
-  "kind": "MedicationRequest",
-  "intent": "proposal",
-  "productCodeableConcept": {
-    "coding": [
-      {
-        "system": "http://id.who.int/icd/release/11/mms", 
-        "code": "XM28X5", 
-        "display": "Measles vaccines"
-      }
-    ]
-  },
-  "doNotPerform": true,
-  "dynamicValue": [
-    {
-      "path" : "status",
-      "expression" : {
-        "language" : "text/cql",
-        "expression" : "'draft'"
-      }
-    },
-    {
-      "path" : "intent",
-      "expression" : {
-        "language" : "text/cql",
-        "expression" : "'proposal'"
-      }
-    },
-    {
-      "path": "dispenseRequest.validityPeriod.start",
-      "expression": {
-        "description": "Due date of the dose",
-        "language": "text/cql-identifier",
-        "expression": "Schedule Due Date for MCV dose"
-      }
-    },
-    {
-      "path": "dispenseRequest.validityPeriod.end",
-      "expression": {
-        "description": "Expiration date for MCV dose",
-        "language": "text/cql-identifier",
-        "expression": "Expiration Date for MCV dose"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/input/resources/plandefinition/IMMZ.DT.08.Measles.json b/input/resources/plandefinition/IMMZ.DT.08.Measles.json
deleted file mode 100644
index cd5ddc3c8a..0000000000
--- a/input/resources/plandefinition/IMMZ.DT.08.Measles.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "resourceType": "PlanDefinition",
-  "id": "IMMZ.DT.08.Measles",
-  "name": "IMMZ.DT.08.Measles",
-  "title": "IMMZ.DT.08.Measles",
-  "description": "If the child or patient has not been given MCV1 (at 9 months) and MCV2 (between 15-18 months) vaccination",
-  "library": [
-    "http://fhir.org/guides/who/smart-immunization/Library/IMMZDT08"
-  ],
-  "action": [
-    {
-      "title": "Immunize patient for Measles",
-      "description": "Provide measles immunization",
-      "condition": [
-        {
-          "kind": "applicability",
-          "expression": {
-            "description": "Provision of the MCV dose",
-            "language": "text/cql-identifier",
-            "expression": "Provision of the MCV dose"
-          }
-        }
-      ],
-      "definitionCanonical": "http://fhir.org/guides/who/smart-immunization/ActivityDefinition/IMMZ.DT.08.Measles.MR"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/sushi-config.yaml b/sushi-config.yaml
index 043aeb0f2b..752bf2896c 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -58,6 +58,7 @@ jurisdiction: http://unstats.un.org/unsd/methods/m49/m49.htm#001
 # For R5 ImplementationGuides, the object can also have a key for `reason`.
 dependencies:  
   hl7.fhir.uv.sdc: 3.0.0
+  hl7.fhir.uv.cpg: current
 #   hl7.fhir.r5.core:
 #     version: 5.0.0-draft-final
 #   hl7.fhir.us.mcode:
@@ -128,7 +129,7 @@ groups:
 
        
     resources:
-      - ActivityDefinition/IMMZ.DT.08.Measles.MR
+      - ActivityDefinition/IMMZDT08MeaslesMR
 ##  GroupB:
 ##    name: Group B
 ##    description: The Beta Group