diff --git a/input/fsh/questionnaires/IMMZCRegisterClient.fsh b/input/fsh/questionnaires/IMMZCRegisterClient.fsh
index 719acc0d6f..24e976f269 100644
--- a/input/fsh/questionnaires/IMMZCRegisterClient.fsh
+++ b/input/fsh/questionnaires/IMMZCRegisterClient.fsh
@@ -12,6 +12,8 @@ Usage: #definition
 * contained[+] = IMMZ.C.DE5
 //* contained[+] = YesNoUnknown
 
+* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap"
+* extension[=].valueCanonical = "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZCQRToPatient"
 
 
 //Header
@@ -47,7 +49,7 @@ Usage: #definition
 
 * insert Question(sex, Sex,choice,true,false)
 * item[=]
-  * answerValueSet = Canonical(IMMZ.C.DE5)
+  * answerValueSet = "#IMMZ.C.DE5"
   * code[+] = IMMZ.C#DE5
   * code[+] = $LNC#46098-0	"Sex"
   * code[+] = $SCT#184100006 "Patient sex (observable entity)"
diff --git a/input/fsh/questionnaires/IMMZD1ClientHistoryMeasles.fsh b/input/fsh/questionnaires/IMMZD1ClientHistoryMeasles.fsh
index d54ca4c601..7579abc18b 100644
--- a/input/fsh/questionnaires/IMMZD1ClientHistoryMeasles.fsh
+++ b/input/fsh/questionnaires/IMMZD1ClientHistoryMeasles.fsh
@@ -10,6 +10,10 @@ Usage: #definition
 * status = #draft
 * contained[+] = IMMZ.D1.DE10
 
+* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap"
+* extension[=].valueCanonical = "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1QRToResources"
+
+
 * insert Question(dose0, Indicates if the client has received a birth dose and/or supplementary dose, boolean, false, false)
 * item[=]
   * code[+] = IMMZ.D1#DE80
@@ -21,7 +25,7 @@ Usage: #definition
   * code[+] = IMMZ.D1#DE81
 * insert Question(hivStatus, The current human immunodeficiency virus HIV status of the client, choice, false, false)
 * item[=]
-  * answerValueSet = Canonical(IMMZ.D1.DE10)
+  * answerValueSet = "#IMMZ.D1.DE10"
   * code[+] = IMMZ.D1#DE10
   * code[+] = $LNC#55277-8
   * code[+] = $SCT#278977008
@@ -42,7 +46,7 @@ Usage: #definition
 * item[=]
   * insert Question(vaccineType, Vaccine type/category that was administered or was to be administered. Any vaccine code available in the IMMZ.Z Vaccine Library list of codes applies in this data element, choice, true, false)
   * item[=]
-    * answerValueSet = Canonical(IMMZ.Z.DE9)
+    * answerValueSet = "#IMMZ.Z.DE9"
     * code[+] = IMMZ.D1#DE19
     * code[+] = $LNC#39236-5
     * code[+] = $SCT#787859002
diff --git a/input/fsh/questionnaires/IMMZD4CheckContraindicationsMeasles.fsh b/input/fsh/questionnaires/IMMZD4CheckContraindicationsMeasles.fsh
index b5a710d574..db69252de5 100644
--- a/input/fsh/questionnaires/IMMZD4CheckContraindicationsMeasles.fsh
+++ b/input/fsh/questionnaires/IMMZD4CheckContraindicationsMeasles.fsh
@@ -11,7 +11,11 @@ Usage: #definition
 * status = #draft
 * contained[+] = IMMZ.D4.DE161
 
+* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap"
+* extension[=].valueCanonical = "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD4QRToResources"
+
+
 * insert Question(contraindications, Specific situations or medical conditions in which it is advised or recommended to avoid or delay administering a particular vaccine, choice, false, true)
 * item[=]
-  * answerValueSet = Canonical(IMMZ.D4.DE161)
+  * answerValueSet = "#IMMZ.D4.DE161"
   * code[+] = IMMZ.D4#DE161