From 34c9178b85606531572b7f8437d0be80f29423b4 Mon Sep 17 00:00:00 2001
From: Luke Duncan <lduncan@path.org>
Date: Fri, 19 Jan 2024 14:03:02 -0800
Subject: [PATCH] Updated measles LM/questionnaire/structuremaps for updates to
 the D1 client history data dictionary in the DAK.

---
 input/fsh/codesystems/IMMZ.D1.fsh             | 37 ++++++++------
 input/fsh/conceptmaps/IMMZ.D1.ConceptMap.fsh  | 38 +++++---------
 .../IMMZ.D1.QuestionnaireResponse.1.fsh       |  2 +-
 .../IMMZ.D1.QuestionnaireResponse.2.fsh       |  5 +-
 .../IMMZ.D1.QuestionnaireResponse.3.fsh       |  8 ++-
 .../fsh/models/IMMZD1ClientHistoryMeasles.fsh | 21 ++++----
 .../models/IMMZD1ClientHistoryYellowFever.fsh | 49 +++++++++++++++++++
 .../models/IMMZD5CheckContraindications.fsh   |  2 +-
 .../QIMMZD1ClientHistoryMeasles.fsh           | 25 ++++++----
 .../QIMMZD5CheckContraindications.fsh         |  2 +-
 input/fsh/valuesets/IMMZ.D1.DE10.fsh          |  8 +--
 input/fsh/valuesets/IMMZ.D1.DE103.fsh         | 11 +++++
 input/fsh/valuesets/IMMZ.D1.DE35.fsh          |  6 +--
 input/fsh/valuesets/IMMZ.D1.DE52.fsh          |  6 +--
 input/fsh/valuesets/IMMZ.D1.DE56.fsh          |  6 +--
 input/fsh/valuesets/IMMZ.D1.DE61.fsh          |  6 +--
 input/fsh/valuesets/IMMZ.D1.DE65.fsh          |  8 +--
 input/fsh/valuesets/IMMZ.D1.DE68.fsh          |  8 +--
 input/fsh/valuesets/IMMZ.D1.DE73.fsh          | 11 +++--
 input/fsh/valuesets/IMMZ.D1.DE77.fsh          | 10 ++++
 input/fsh/valuesets/IMMZ.D1.DE84.fsh          |  9 ++--
 input/fsh/valuesets/IMMZ.D1.DE87.fsh          |  6 +--
 input/fsh/valuesets/IMMZ.Z.DE23.fsh           | 12 +++++
 input/fsh/valuesets/IMMZ.Z.DE9.fsh            |  4 +-
 .../fsh/valuesets/LiveAttenuatedVaccines.fsh  |  1 -
 ...ces.fml => IMMZD1MeaslesLMToResources.fml} | 23 +++++++--
 ...MZD1QRToLM.fml => IMMZD1MeaslesQRToLM.fml} | 12 +++--
 ...ces.fml => IMMZD1MeaslesQRToResources.fml} |  6 +--
 28 files changed, 226 insertions(+), 116 deletions(-)
 create mode 100644 input/fsh/models/IMMZD1ClientHistoryYellowFever.fsh
 create mode 100644 input/fsh/valuesets/IMMZ.D1.DE103.fsh
 create mode 100644 input/fsh/valuesets/IMMZ.D1.DE77.fsh
 create mode 100644 input/fsh/valuesets/IMMZ.Z.DE23.fsh
 rename input/maps/{IMMZD1LMToResources.fml => IMMZD1MeaslesLMToResources.fml} (87%)
 rename input/maps/{IMMZD1QRToLM.fml => IMMZD1MeaslesQRToLM.fml} (88%)
 rename input/maps/{IMMZD1QRToResources.fml => IMMZD1MeaslesQRToResources.fml} (88%)

diff --git a/input/fsh/codesystems/IMMZ.D1.fsh b/input/fsh/codesystems/IMMZ.D1.fsh
index 07440171ce..334eeba320 100644
--- a/input/fsh/codesystems/IMMZ.D1.fsh
+++ b/input/fsh/codesystems/IMMZ.D1.fsh
@@ -1,14 +1,19 @@
-CodeSystem:   IMMZ.D1
+CodeSystem: IMMZ.D1
 Title:        "IMMZ.D1 CodeSystem for Data Elements"
-Description:  "CodeSystem for IMMZ.C Data Elements"
+Description:  "CodeSystem for IMMZ.D1 Data Elements"
 
 * ^experimental = false
 * ^caseSensitive = false
 * ^name = "IMMZ_D1"
 
-* #DE80 "Dose 0 administered" "Indicates if the client has received a birth dose and/or a zero dose"
-* #DE95 "Booster dose administered" "Indicates if the client has received a booster dose and/or a supplementary dose"
+* #DE109 "Birth dose" "Indicates if the client received a dose within 24 hours of birth. Whether a birth dose is counted as part of the primary series will depend on the antigen."
+* #DE103 "Type of dose" "The type of dose in a series that the client received "
+* #DE104 "Primary series" "Indicates that the client received the primary vaccination series of a product/antigen. This is also applicable for antigens with one dose."
+* #DE105 "Dose 0" "Indicates that the client received a dose of a product/ antigen within 24 hours of birth. This dose is not a part of the primary vaccination series."
+* #DE106 "Supplementary dose" "Indicates that the client received a supplementary dose of a product/antigen"
+* #DE107 "Booster dose" "Indicates that the client received booster dose of a product/antigen"
 * #DE8 "Completed the primary vaccination series" "Indicates if the client has completed the primary vaccination series of a product/antigen. If the client has not yet completed their primary series, it means they may be expected to receive more doses to complete their vaccination regimen for the respective product/antigen."
+* #DE102 "Completed the booster series" "Indicates if the client has completed the booster series of a product/antigen"
 * #DE81 "Date when primary vaccination series was completed" "The date when the client completed the primary vaccination series (per product/antigen)"
 * #DE10 "HIV status" "The current human immunodeficiency virus (HIV) status of the client"
 * #DE11 "HIV-positive" "The client is known to be HIV positive"
@@ -19,7 +24,7 @@ Description:  "CodeSystem for IMMZ.C Data Elements"
 * #DE17 "Currently on ART" "The client is currently receiving antiretroviral therapy (ART)"
 * #DE84 "Type of TB infection test performed" "The type of TB infection test performed"
 * #DE85 "IGRA" "Interferon-gamma release assay (IGRA)"
-* #DE86 "TST" "Tuberculin skin test (TST)"
+* #DE86 "TST" "Tuberculin skin test (TST) "
 * #DE87 "TB infection test result" "Records the result of the TB infection test"
 * #DE88 "Positive" "Test result was positive"
 * #DE89 "Negative" "Test result was negative"
@@ -29,11 +34,9 @@ Description:  "CodeSystem for IMMZ.C Data Elements"
 * #DE35 "Type of polio dose" "The type of the polio vaccine dose administered to the client"
 * #DE36 "IPV" "Inactivated poliovirus vaccine (IPV)"
 * #DE37 "bOPV" "Bivalent oral poliovirus vaccine (bOPV)"
-* #DE38 "Age in years when client received first DTP dose" "The client's age in years when they received their first diphtheria-tetanus-pertussis (DTP) dose"
-* #DE39 "Age in months when client received first Hib dose" "The client's age in months when they received their first Haemophilus influenzae type b (Hib) dose"
-* #DE92 "Severely immunosuppressed" "The client is known to be severely immunocompromised or immunosuppressed"
+* #DE92 "Severely immunosuppressed" "The client is known to be severely immunosuppressed"
 * #DE49 "ART start date" "The date on which the client started or restarted antiretroviral therapy (ART)"
-* #DE96 "High risk of pneumococcal infection" "The client is at high risk for pneumococcal infection because of underlying medical conditions (i.e. HIV infection or sickle-cell disease)"
+* #DE96 "High risk of pneumococcal infection " "The client is at high risk for pneumococcal infection because of underlying medical conditions (i.e. HIV infection or sickle-cell disease)"
 * #DE52 "Type of JE dose" "The type of Japanese encephalitis (JE) vaccine dose administered to the client"
 * #DE53 "Inactivated Vero cell-derived vaccine" "Inactivated Vero cell-derived Japanese encephalitis (JE) vaccine type"
 * #DE54 "Live attenuated vaccine" "Live attenuated Japanese encephalitis (JE) vaccine type"
@@ -49,7 +52,7 @@ Description:  "CodeSystem for IMMZ.C Data Elements"
 * #DE64 "Ty21a" "Ty21a vaccine"
 * #DE65 "Type of cholera dose" "The type of cholera vaccine dose administered to the client"
 * #DE66 "WC vaccine" "Killed whole cell (WC) only cholera vaccine"
-* #DE67 "WC-rBS vaccine" "Vaccine contains a mixture of the recombinant B subunit (rBS) of cholera toxin plus killed whole cell (WC)"
+* #DE67 "WC-rBS vaccine" "Vaccine contains a mixture of the recombinant B subunit (rBS) of cholera toxin plus killed whole cell (WC) "
 * #DE68 "Type of meningococcal dose" "The type of meningococcal vaccine dose administered to the client"
 * #DE69 "MenA conjugate vaccine (5µg)" "Monovalent serogroup A (MenA) conjugate vaccine (5µg) vaccine"
 * #DE70 "Monovalent MenC conjugate" "Monovalent MenC conjugate vaccine"
@@ -59,10 +62,12 @@ Description:  "CodeSystem for IMMZ.C Data Elements"
 * #DE73 "Type of hepatitis A dose" "The type of hepatitis A vaccine dose administered to the client"
 * #DE74 "Live attenuated hepatitis A vaccine" "Live attenuated hepatitis A vaccine"
 * #DE75 "Inactivated hepatitis A vaccine" "Inactivated hepatitis A vaccine"
+* #DE99 "Type of hepatitis B dose" "The type of hepatitis B vaccine dose administered to the client"
+* #DE100 "Hepatitis B monovalent vaccine" "Hepatitis B monovalent vaccine"
+* #DE101 "Hepatitis B combination vaccine" "Hepatitis B combination vaccine"
 * #DE76 "VNA level" "Vaccine-induced neutralizing (VNA) antibody level. It is a measured as a serum antibody concentration amount observed from the result of the concentrated, purified cell culture and embryonated egg-based rabies vaccines (CCEEV)"
-* #DE98 "Risk of occupational exposure to rabies virus" "Professional at risk of occupational exposure to rabies virus, particularly animal health-care workers. Also considered for medical professionals who regularly provide care to persons with rabies."
-* #DE77 "Seronegative for dengue" "The client is known to be seronegative for dengue"
-* #DE99 "Evidence of a past dengue infection" "There is evidence of a past dengue infection based on an antibody test or on a documented laboratory confirmed dengue infection in the past"
-
-* #DE19	"Vaccine type" "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"
-* #DE20	"Date and time of vaccination" "Represents the visit/encounter date, which is the date and time when the vaccine was administered to the client"
\ No newline at end of file
+* #DE98 "Risk of occupational exposure to rabies virus" "Professional at risk of occupational exposure to rabies virus, particularly animal health-care workers. Also considered for medical professionals who regularly provide care to persons with rabies. "
+* #DE77 "Dengue serostatus" "Indicates the result of a serological test determining whether the client has antibodies against the dengue virus"
+* #DE110 "Positive" "The client has detectable antibodies against the dengue virus, suggesting past exposure or vaccination"
+* #DE111 "Negative" "The client does not have detectable antibodies, indicating no previous exposure or vaccination against the dengue virus"
+* #DE112 "Unknown" "The client's dengue serostatus is unknown"
diff --git a/input/fsh/conceptmaps/IMMZ.D1.ConceptMap.fsh b/input/fsh/conceptmaps/IMMZ.D1.ConceptMap.fsh
index b677ee2aeb..bfd4d39030 100644
--- a/input/fsh/conceptmaps/IMMZ.D1.ConceptMap.fsh
+++ b/input/fsh/conceptmaps/IMMZ.D1.ConceptMap.fsh
@@ -1,5 +1,5 @@
-Instance:     IMMZ.D1.ConceptMap
-InstanceOf:   ConceptMap
+Instance: IMMZ.D1.ConceptMap
+InstanceOf: ConceptMap
 Description:  "Mapping to and from IMMZ.D1 Data Dictionary to other codesystems."
 Usage:        #definition
 
@@ -7,7 +7,7 @@ Usage:        #definition
 * title = "ConceptMap to and from IMMZ.D1 DataElements"
 * status = #active
 * experimental = false
-* date = "2023-08-09"
+* date = "2024-01-19"
 
 * group[+]
   * source = Canonical(IMMZ.D1)
@@ -40,8 +40,7 @@ Usage:        #definition
   * insert ElementMap(DE97, XM92B2, narrower)
   * insert ElementMap(DE74, XM6LL6, wider)
   * insert ElementMap(DE75, XM2A12, equivalent)
-
-
+  * insert ElementMap(DE100, XM9V38, relatedto)
 * group[+]
   * source = $ICD11
   * target = Canonical(IMMZ.D1)
@@ -73,48 +72,40 @@ Usage:        #definition
   * insert ElementMap(XM92B2, DE97, wider)
   * insert ElementMap(XM6LL6, DE74, narrower)
   * insert ElementMap(XM2A12, DE75, equivalent)
+  * insert ElementMap(XM9V38, DE100, relatedto)
 
-
-  
 * group[+]
   * source = Canonical(IMMZ.D1)
   * target = $LNC
-  * insert ElementMap(DE11, 45683-0, equivalent)
   * insert ElementMap(DE10, 55277-8, equivalent)
-  * insert ElementMap(DE92, 96381-9, relatedto)
+  * insert ElementMap(DE11, 45683-0, equivalent)
   * insert ElementMap(DE15, 76517-2, equivalent)
-  * insert ElementMap(DE19, 39236-5, equivalent)
-  * insert ElementMap(DE20, 30952-6, equivalent)
   * insert ElementMap(DE16, 96381-9, relatedto)
   * insert ElementMap(DE85, 27415-9, wider)
   * insert ElementMap(DE86, 39263-9, equivalent)
   * insert ElementMap(DE88, 45241-7, relatedto)
   * insert ElementMap(DE29, 8339-4, equivalent)
-
+  * insert ElementMap(DE92, 96381-9, relatedto)
 * group[+]
   * source = $LNC
   * target = Canonical(IMMZ.D1)
-  * insert ElementMap(45683-0, DE11, equivalent)
   * insert ElementMap(55277-8, DE10, equivalent)
-  * insert ElementMap(96381-9, DE92, relatedto)
+  * insert ElementMap(45683-0, DE11, equivalent)
   * insert ElementMap(76517-2, DE15, equivalent)
-  * insert ElementMap(39236-5, DE19, equivalent)
-  * insert ElementMap(30952-6, DE20, equivalent)
   * insert ElementMap(96381-9, DE16, relatedto)
   * insert ElementMap(27415-9, DE85, narrower)
   * insert ElementMap(39263-9, DE86, equivalent)
   * insert ElementMap(45241-7, DE88, relatedto)
   * insert ElementMap(8339-4, DE29, equivalent)
-
-
+  * insert ElementMap(96381-9, DE92, relatedto)
 
 * group[+]
   * source = Canonical(IMMZ.D1)
   * target = $SCT
-  * insert ElementMap(DE12, 165815009, equivalent)
+  * insert ElementMap(DE10, 278977008, equivalent)
   * insert ElementMap(DE11, 165816005, equivalent)
+  * insert ElementMap(DE12, 165815009, equivalent)
   * insert ElementMap(DE13, 261665006, wider)
-  * insert ElementMap(DE10, 278977008, equivalent)
   * insert ElementMap(DE15, 395507008, equivalent)
   * insert ElementMap(DE16, 370388006, equivalent)
   * insert ElementMap(DE85, 68311008, equivalent)
@@ -122,15 +113,13 @@ Usage:        #definition
   * insert ElementMap(DE88, 10828004, wider)
   * insert ElementMap(DE89, 260385009, wider)
   * insert ElementMap(DE36, 871740006, equivalent)
-
-
 * group[+]
   * source = $SCT
   * target = Canonical(IMMZ.D1)
-  * insert ElementMap(165815009, DE12, equivalent)
+  * insert ElementMap(278977008, DE10, equivalent)
   * insert ElementMap(165816005, DE11, equivalent)
+  * insert ElementMap(165815009, DE12, equivalent)
   * insert ElementMap(261665006, DE13, narrower)
-  * insert ElementMap(278977008, DE10, equivalent)
   * insert ElementMap(395507008, DE15, equivalent)
   * insert ElementMap(370388006, DE16, equivalent)
   * insert ElementMap(68311008, DE85, equivalent)
@@ -139,4 +128,3 @@ Usage:        #definition
   * insert ElementMap(260385009, DE89, narrower)
   * insert ElementMap(871740006, DE36, equivalent)
 
-
diff --git a/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.1.fsh b/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.1.fsh
index 37df9c8930..a81ae7b7ca 100644
--- a/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.1.fsh
+++ b/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.1.fsh
@@ -7,7 +7,7 @@ Usage: #example
 * subject = Reference(patient123456)
 
 * item[+]
-  * linkId = "dose0"
+  * linkId = "birth"
   * answer.valueBoolean = false
 * item[+]
   * linkId = "booster"
diff --git a/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.2.fsh b/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.2.fsh
index b220d9d264..90e3c06523 100644
--- a/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.2.fsh
+++ b/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.2.fsh
@@ -7,8 +7,11 @@ Usage: #example
 * subject = Reference(patient654321)
 
 * item[+]
-  * linkId = "dose0"
+  * linkId = "birth"
   * answer.valueBoolean = false
+* item[+]
+  * linkId = "type"
+  * answer.valueCoding = IMMZ.D1#DE104
 * item[+]
   * linkId = "booster"
   * answer.valueBoolean = false
diff --git a/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.3.fsh b/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.3.fsh
index 541a3b3b8c..c07381f511 100644
--- a/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.3.fsh
+++ b/input/fsh/examples/IMMZ.D1.QuestionnaireResponse.3.fsh
@@ -7,8 +7,14 @@ Usage: #example
 * subject = Reference(patient654321)
 
 * item[+]
-  * linkId = "dose0"
+  * linkId = "birth"
   * answer.valueBoolean = false
+* item[+]
+  * linkId = "type"
+  * answer.valueCoding = IMMZ.D1#DE104
+* item[+]
+  * linkId = "type"
+  * answer.valueCoding = IMMZ.D1#DE105
 * item[+]
   * linkId = "booster"
   * answer.valueBoolean = false
diff --git a/input/fsh/models/IMMZD1ClientHistoryMeasles.fsh b/input/fsh/models/IMMZD1ClientHistoryMeasles.fsh
index ac00a349cd..db075da62b 100644
--- a/input/fsh/models/IMMZD1ClientHistoryMeasles.fsh
+++ b/input/fsh/models/IMMZD1ClientHistoryMeasles.fsh
@@ -5,20 +5,23 @@ Description:  "Data elements for the IMMZ.D1 Capture Client History Data Diction
 * ^name = "IMMZ_D1_Client_History_Measles"
 
 * patient 1..1 Reference "Patient" "The patient who is being checked for contraindications."
-* dose0 0..1 boolean "Dose 0 administered" "Indicates if the client has received a birth dose and/or a zero dose"
-  * ^code[+] = IMMZ.D1#DE80
-* booster 0..1 boolean "Booster dose administered" "Indicates if the client has received a booster dose and/or a supplementary dose"
-  * ^code[+] = IMMZ.D1#DE95
+* birth 0..1 boolean "Birth dose" "Indicates if the client received a dose within 24 hours of birth. Whether a birth dose is counted as part of the primary series will depend on the antigen."
+  * ^code[+] = IMMZ.D1#DE109
+* type 0..* Coding "Type of dose" "The type of dose in a series that the client received"
+  * ^code[+] = IMMZ.D1#DE103
+* type from IMMZ.D1.DE103
 * completedPrimarySeries 0..1 boolean "Completed the primary vaccination series" "Indicates if the client has completed the primary vaccination series of a product/antigen. If the client has not yet completed their primary series, it means they may be expected to receive more doses to complete their vaccination regimen for the respective product/antigen."
   * ^code[+] = IMMZ.D1#DE8
-* dateSeriesCompleted 1..1 date "Date when primary vaccination series was completed" "The date when the client completed the primary vaccination series (per product/antigen)"
+* booster 0..1 boolean "Completed the booster series" "Indicates if the client has completed the booster series of a product/antigen"
+  * ^code[+] = IMMZ.D1#DE102
+* dateSeriesCompleted 0..1 date "Date when primary vaccination series was completed" "The date when the client completed the primary vaccination series (per product/antigen)"
   * ^code[+] = IMMZ.D1#DE81
 * hivStatus 0..1 Coding "HIV status" "The current human immunodeficiency virus (HIV) status of the client"
   * ^code[+] = IMMZ.D1#DE10
   * ^code[+] = $LNC#55277-8
   * ^code[+] = $SCT#278977008
 * hivStatus from IMMZ.D1.DE10
-* pretermBirth 0..1 boolean "Preterm birth" "The infant was preterm, the mother gave birth to the infant when gestational age was less than 37 weeks"
+* pretermBirth 0..1 boolean "Preterm birth" "The infant was preterm; the mother gave birth to the infant when gestational age was less than 37 weeks"
   * ^code[+] = IMMZ.D1#DE15
   * ^code[+] = $ICD11#KA21.4
   * ^code[+] = $LNC#76517-2
@@ -33,14 +36,14 @@ Description:  "Data elements for the IMMZ.D1 Capture Client History Data Diction
 * severelyImmunosuppressed 1..1 boolean "Severely immunosuppressed" "The client is known to be severely immunocompromised or immunosuppressed"
   * ^code[+] = IMMZ.D1#DE92
   * ^code[=] = $LNC#96381-9
-* artStartDate 1..1 date "ART start date" "The date on which the client started or restarted antiretroviral therapy (ART)"
+* artStartDate 0..1 date "ART start date" "The date on which the client started or restarted antiretroviral therapy (ART)"
   * ^code[+] = IMMZ.D1#DE49
 * vaccineHistory 0..* BackboneElement "Vaccine History" "History of previous vaccine doses."
   * vaccineType 0..1 Coding "Vaccine type" "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"
-    * ^code[+] = IMMZ.D1#DE19
+    * ^code[+] = IMMZ.D#DE19
     * ^code[+] = $LNC#39236-5
     * ^code[+] = $SCT#787859002
   * vaccineType from IMMZ.Z.DE9
   * vaccineDate 0..1 date "Date and time of vaccination" "Represents the visit/encounter date, which is the date and time when the vaccine was administered to the client"
-    * ^code[+] = IMMZ.D1#DE20
+    * ^code[+] = IMMZ.D#DE20
     * ^code[+] = $LNC#30952-6 
\ No newline at end of file
diff --git a/input/fsh/models/IMMZD1ClientHistoryYellowFever.fsh b/input/fsh/models/IMMZD1ClientHistoryYellowFever.fsh
new file mode 100644
index 0000000000..ecd54b1ece
--- /dev/null
+++ b/input/fsh/models/IMMZD1ClientHistoryYellowFever.fsh
@@ -0,0 +1,49 @@
+Logical:      IMMZD1ClientHistoryYellowFever
+Title:        "IMMZ.D1 Capture Client History for Yellow Fever"
+Description:  "Data elements for the IMMZ.D1 Capture Client History Data Dictionary for Yellow Fever."
+
+* ^name = "IMMZ_D1_Client_History_YellowFever"
+
+* patient 1..1 Reference "Patient" "The patient who is being checked for contraindications."
+* birth 0..1 boolean "Birth dose" "Indicates if the client received a dose within 24 hours of birth. Whether a birth dose is counted as part of the primary series will depend on the antigen."
+  * ^code[+] = IMMZ.D1#DE109
+* type 1..* Coding "Type of dose" "The type of dose in a series that the client received"
+  * ^code[+] = IMMZ.D1#DE103
+* type from IMMZ.D1.DE103
+* completedPrimarySeries 0..1 boolean "Completed the primary vaccination series" "Indicates if the client has completed the primary vaccination series of a product/antigen. If the client has not yet completed their primary series, it means they may be expected to receive more doses to complete their vaccination regimen for the respective product/antigen."
+  * ^code[+] = IMMZ.D1#DE8
+* booster 0..1 boolean "Completed the booster series" "Indicates if the client has completed the booster series of a product/antigen"
+  * ^code[+] = IMMZ.D1#DE102
+* dateSeriesCompleted 1..1 date "Date when primary vaccination series was completed" "The date when the client completed the primary vaccination series (per product/antigen)"
+  * ^code[+] = IMMZ.D1#DE81
+* hivStatus 0..1 Coding "HIV status" "The current human immunodeficiency virus (HIV) status of the client"
+  * ^code[+] = IMMZ.D1#DE10
+  * ^code[+] = $LNC#55277-8
+  * ^code[+] = $SCT#278977008
+* hivStatus from IMMZ.D1.DE10
+* pretermBirth 0..1 boolean "Preterm birth" "The infant was preterm; the mother gave birth to the infant when gestational age was less than 37 weeks"
+  * ^code[+] = IMMZ.D1#DE15
+  * ^code[+] = $ICD11#KA21.4
+  * ^code[+] = $LNC#76517-2
+  * ^code[+] = $SCT#395507008
+* immunocompromised 0..1 boolean "Immunocompromised" "The client is known to be immunocompromised. This means the client has a weakened immune system and having a reduced ability to fight infections and other diseases"
+  * ^code[+] = IMMZ.D1#DE16
+  * ^code[+] = $ICD11#4B4Z
+  * ^code[+] = $LNC#96381-9
+  * ^code[+] = $SCT#370388006
+* onART 0..1 boolean "Currently on ART" "The client is currently receiving antiretroviral therapy (ART)"
+  * ^code[+] = IMMZ.D1#DE17
+* severelyImmunosuppressed 1..1 boolean "Severely immunosuppressed" "The client is known to be severely immunocompromised or immunosuppressed"
+  * ^code[+] = IMMZ.D1#DE92
+  * ^code[=] = $LNC#96381-9
+* artStartDate 1..1 date "ART start date" "The date on which the client started or restarted antiretroviral therapy (ART)"
+  * ^code[+] = IMMZ.D1#DE49
+* vaccineHistory 0..* BackboneElement "Vaccine History" "History of previous vaccine doses."
+  * vaccineType 0..1 Coding "Vaccine type" "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"
+    * ^code[+] = IMMZ.D#DE19
+    * ^code[+] = $LNC#39236-5
+    * ^code[+] = $SCT#787859002
+  * vaccineType from IMMZ.Z.DE9
+  * vaccineDate 0..1 date "Date and time of vaccination" "Represents the visit/encounter date, which is the date and time when the vaccine was administered to the client"
+    * ^code[+] = IMMZ.D#DE20
+    * ^code[+] = $LNC#30952-6 
\ No newline at end of file
diff --git a/input/fsh/models/IMMZD5CheckContraindications.fsh b/input/fsh/models/IMMZD5CheckContraindications.fsh
index 03f7378ed8..6514dd4ed0 100644
--- a/input/fsh/models/IMMZD5CheckContraindications.fsh
+++ b/input/fsh/models/IMMZD5CheckContraindications.fsh
@@ -1,4 +1,4 @@
-Logical:      IMMZ5CheckContraindications
+Logical:      IMMZD5CheckContraindications
 Title:        "IMMZ.D5 Check Contraindications"
 Description:  "Data elements for the IMMZ.D5 Check Contraindications Data Dictionary."
 
diff --git a/input/fsh/questionnaires/QIMMZD1ClientHistoryMeasles.fsh b/input/fsh/questionnaires/QIMMZD1ClientHistoryMeasles.fsh
index 0dfee90045..88ffbdde55 100644
--- a/input/fsh/questionnaires/QIMMZD1ClientHistoryMeasles.fsh
+++ b/input/fsh/questionnaires/QIMMZD1ClientHistoryMeasles.fsh
@@ -10,21 +10,26 @@ Usage: #definition
 * language = #en
 * status = #draft
 * contained[+] = IMMZ.D1.DE10
+* contained[+] = IMMZ.D1.DE103
 
 * 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 a zero dose, boolean, false, false)
+* insert Question(birth, Indicates if the client received a dose within 24 hours of birth. Whether a birth dose is counted as part of the primary series will depend on the antigen., boolean, false, false)
 * item[=]
-  * code[+] = IMMZ.D1#DE80
-* insert Question(booster, Indicates if the client has received a booster dose and/or a supplementary dose, boolean, false, false)
+  * code[+] = IMMZ.D1#DE109
+* insert Question(type, The type of dose in a series that the client received, choice, false, true)
 * item[=]
-  * code[+] = IMMZ.D1#DE95
+  * answerValueSet = Canonical(IMMZ.D1.DE103)
+  * code[+] = IMMZ.D1#DE103
+* insert Question(booster, Indicates if the client has completed the booster series of a product/antigen, boolean, false, false)
+* item[=]
+  * code[+] = IMMZ.D1#DE102
 * insert Question(completedPrimarySeries, Indicates if the client has completed the primary vaccination series of a product/antigen. If the client has not yet completed their primary series\, it means they may be expected to receive more doses to complete their vaccination regimen for the respective product/antigen., boolean, false, false)
 * item[=]
   * code[+] = IMMZ.D1#DE8
-* insert Question(dateSeriesCompleted, The date when the client completed the primary vaccination series - per product/antigen, date, false, true)
+* insert Question(dateSeriesCompleted, The date when the client completed the primary vaccination series - per product/antigen, date, false, false)
 * item[=]
   * code[+] = IMMZ.D1#DE81
 * insert Question(hivStatus, The current human immunodeficiency virus HIV status of the client, choice, false, false)
@@ -39,7 +44,7 @@ Usage: #definition
   * code[+] = $ICD11#KA21.4
   * code[+] = $LNC#76517-2
   * code[+] = $SCT#395507008
-* insert Question(immunocompromised, The client is known to be immunocompromised. This means the client has a weakened immune system and having a reduced ability to fight infections and other diseases, boolean, false, false)
+* insert Question(immunocompromised, The client is known to be immunocompromised. This means the client has a weakened immune system and having a reduced ability to fight infections and other diseases, boolean, true, false)
 * item[=]
   * code[+] = IMMZ.D1#DE16
   * code[+] = $ICD11#4B4Z
@@ -48,11 +53,11 @@ Usage: #definition
 * insert Question(onART, The client is currently receiving antiretroviral therapy - ART, boolean, false, false)
 * item[=]
   * code[+] = IMMZ.D1#DE17
-* insert Question(severelyImmunosuppressed, The client is known to be severely immunocompromised or immunosuppressed, boolean, false, true)
+* insert Question(severelyImmunosuppressed, The client is known to be severely immunocompromised or immunosuppressed, boolean, true, false)
 * item[=] 
   * code[+] = IMMZ.D1#DE92
   * code[+] = $LNC#96381-9
-* insert Question(artStartDate, The date on which the client started or restarted antiretroviral therapy ART, date, false, true)
+* insert Question(artStartDate, The date on which the client started or restarted antiretroviral therapy ART, date, false, false)
 * item[=]
   * code[+] = IMMZ.D1#DE49
 * insert Question(vaccineHistory, Vaccine History, group, false, true)
@@ -60,10 +65,10 @@ Usage: #definition
   * 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)
-    * code[+] = IMMZ.D1#DE19
+    * code[+] = IMMZ.D#DE19
     * code[+] = $LNC#39236-5
     * code[+] = $SCT#787859002
   * insert Question(vaccineDate, Represents the visit/encounter date\, which is the date and time when the vaccine was administered to the client, date, true, false)
   * item[=]
-    * code[+] = IMMZ.D1#DE20
+    * code[+] = IMMZ.D#DE20
     * code[+] = $LNC#30952-6  
\ No newline at end of file
diff --git a/input/fsh/questionnaires/QIMMZD5CheckContraindications.fsh b/input/fsh/questionnaires/QIMMZD5CheckContraindications.fsh
index 4485f2a0ca..442eed1ab1 100644
--- a/input/fsh/questionnaires/QIMMZD5CheckContraindications.fsh
+++ b/input/fsh/questionnaires/QIMMZD5CheckContraindications.fsh
@@ -1,4 +1,4 @@
-Instance: QIMMZ5CheckContraindications
+Instance: QIMMZD5CheckContraindications
 InstanceOf: sdc-questionnaire-extr-smap
 Title: "Check Contraindications Questionnaire"
 Description: "Immunization - Check Contraindications Questionnaire"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE10.fsh b/input/fsh/valuesets/IMMZ.D1.DE10.fsh
index 28716b9722..fca78a416e 100644
--- a/input/fsh/valuesets/IMMZ.D1.DE10.fsh
+++ b/input/fsh/valuesets/IMMZ.D1.DE10.fsh
@@ -1,10 +1,10 @@
-ValueSet:     IMMZ.D1.DE10
-Title:        "IMMZ.D1.DE10 ValueSet for HIV Status"
-Description:  "ValueSet for HIV Status for IMMZ.D1.DE10."
+ValueSet: IMMZ.D1.DE10
+Title: "IMMZ.D1.DE10 ValueSet for HIV status"
+Description: "ValueSet for HIV status for IMMZ.D1.DE10"
 
 * ^status = #active
 * ^name = "IMMZ_D1_DE10"
 
 * IMMZ.D1#DE11 "HIV-positive"
 * IMMZ.D1#DE12 "HIV-negative"
-* IMMZ.D1#DE13 "Unknown"
\ No newline at end of file
+* IMMZ.D1#DE13 "Unknown"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE103.fsh b/input/fsh/valuesets/IMMZ.D1.DE103.fsh
new file mode 100644
index 0000000000..e9b6787f3c
--- /dev/null
+++ b/input/fsh/valuesets/IMMZ.D1.DE103.fsh
@@ -0,0 +1,11 @@
+ValueSet: IMMZ.D1.DE103
+Title: "IMMZ.D1.DE103 ValueSet for Type of dose"
+Description: "ValueSet for Type of dose for IMMZ.D1.DE103"
+
+* ^status = #active
+* ^name = "IMMZ_D1_DE103"
+
+* IMMZ.D1#DE104 "Primary series"
+* IMMZ.D1#DE105 "Dose 0"
+* IMMZ.D1#DE106 "Supplementary dose"
+* IMMZ.D1#DE107 "Booster dose"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE35.fsh b/input/fsh/valuesets/IMMZ.D1.DE35.fsh
index d7a810bde2..676ae1bebc 100644
--- a/input/fsh/valuesets/IMMZ.D1.DE35.fsh
+++ b/input/fsh/valuesets/IMMZ.D1.DE35.fsh
@@ -1,6 +1,6 @@
-ValueSet:     IMMZ.D1.DE35
-Title:        "IMMZ.D1.DE35 ValueSet for Type of polio dose"
-Description:  "ValueSet for Type of polio dose for IMMZ.D1.DE35."
+ValueSet: IMMZ.D1.DE35
+Title: "IMMZ.D1.DE35 ValueSet for Type of polio dose"
+Description: "ValueSet for Type of polio dose for IMMZ.D1.DE35"
 
 * ^status = #active
 * ^name = "IMMZ_D1_DE35"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE52.fsh b/input/fsh/valuesets/IMMZ.D1.DE52.fsh
index c76b822270..5d41a78278 100644
--- a/input/fsh/valuesets/IMMZ.D1.DE52.fsh
+++ b/input/fsh/valuesets/IMMZ.D1.DE52.fsh
@@ -1,6 +1,6 @@
-ValueSet:     IMMZ.D1.DE52
-Title:        "IMMZ.D1.DE52 ValueSet for Type of JE dose"
-Description:  "ValueSet for Type of JE dose for IMMZ.D1.DE52."
+ValueSet: IMMZ.D1.DE52
+Title: "IMMZ.D1.DE52 ValueSet for Type of JE dose"
+Description: "ValueSet for Type of JE dose for IMMZ.D1.DE52"
 
 * ^status = #active
 * ^name = "IMMZ_D1_DE52"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE56.fsh b/input/fsh/valuesets/IMMZ.D1.DE56.fsh
index 004f25fa73..5fc50f5fd7 100644
--- a/input/fsh/valuesets/IMMZ.D1.DE56.fsh
+++ b/input/fsh/valuesets/IMMZ.D1.DE56.fsh
@@ -1,6 +1,6 @@
-ValueSet:     IMMZ.D1.DE56
-Title:        "IMMZ.D1.DE56 ValueSet for Type of TBE dose"
-Description:  "ValueSet for Type of TBE dose for IMMZ.D1.DE56."
+ValueSet: IMMZ.D1.DE56
+Title: "IMMZ.D1.DE56 ValueSet for Type of TBE dose"
+Description: "ValueSet for Type of TBE dose for IMMZ.D1.DE56"
 
 * ^status = #active
 * ^name = "IMMZ_D1_DE56"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE61.fsh b/input/fsh/valuesets/IMMZ.D1.DE61.fsh
index 245c4193f8..13ae8afc2b 100644
--- a/input/fsh/valuesets/IMMZ.D1.DE61.fsh
+++ b/input/fsh/valuesets/IMMZ.D1.DE61.fsh
@@ -1,6 +1,6 @@
-ValueSet:     IMMZ.D1.DE61
-Title:        "IMMZ.D1.DE61 ValueSet for Type of typhoid dose"
-Description:  "ValueSet for Type of typhoid dose for IMMZ.D1.DE61."
+ValueSet: IMMZ.D1.DE61
+Title: "IMMZ.D1.DE61 ValueSet for Type of typhoid dose"
+Description: "ValueSet for Type of typhoid dose for IMMZ.D1.DE61"
 
 * ^status = #active
 * ^name = "IMMZ_D1_DE61"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE65.fsh b/input/fsh/valuesets/IMMZ.D1.DE65.fsh
index e65854b1e3..c6feb28558 100644
--- a/input/fsh/valuesets/IMMZ.D1.DE65.fsh
+++ b/input/fsh/valuesets/IMMZ.D1.DE65.fsh
@@ -1,9 +1,9 @@
-ValueSet:     IMMZ.D1.DE65
-Title:        "IMMZ.D1.DE65 ValueSet for Type of cholera dose"
-Description:  "ValueSet for Type of cholera dose for IMMZ.D1.DE65."
+ValueSet: IMMZ.D1.DE65
+Title: "IMMZ.D1.DE65 ValueSet for Type of cholera dose"
+Description: "ValueSet for Type of cholera dose for IMMZ.D1.DE65"
 
 * ^status = #active
 * ^name = "IMMZ_D1_DE65"
 
 * IMMZ.D1#DE66 "WC vaccine"
-* IMMZ.D1#DE67 "WC-rBS vaccine"
\ No newline at end of file
+* IMMZ.D1#DE67 "WC-rBS vaccine"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE68.fsh b/input/fsh/valuesets/IMMZ.D1.DE68.fsh
index 82b689d492..df9773f4d8 100644
--- a/input/fsh/valuesets/IMMZ.D1.DE68.fsh
+++ b/input/fsh/valuesets/IMMZ.D1.DE68.fsh
@@ -1,6 +1,6 @@
-ValueSet:     IMMZ.D1.DE68
-Title:        "IMMZ.D1.DE68 ValueSet for Type of meningococcal dose"
-Description:  "ValueSet for Type of meningococcal dose for IMMZ.D1.DE68."
+ValueSet: IMMZ.D1.DE68
+Title: "IMMZ.D1.DE68 ValueSet for Type of meningococcal dose"
+Description: "ValueSet for Type of meningococcal dose for IMMZ.D1.DE68"
 
 * ^status = #active
 * ^name = "IMMZ_D1_DE68"
@@ -8,4 +8,4 @@ Description:  "ValueSet for Type of meningococcal dose for IMMZ.D1.DE68."
 * IMMZ.D1#DE69 "MenA conjugate vaccine (5µg)"
 * IMMZ.D1#DE70 "Monovalent MenC conjugate"
 * IMMZ.D1#DE71 "Quadrivalent conjugate"
-* IMMZ.D1#DE97 "Polysaccharide vaccine"
\ No newline at end of file
+* IMMZ.D1#DE97 "Polysaccharide vaccine"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE73.fsh b/input/fsh/valuesets/IMMZ.D1.DE73.fsh
index 8fa931392d..1a050c30fc 100644
--- a/input/fsh/valuesets/IMMZ.D1.DE73.fsh
+++ b/input/fsh/valuesets/IMMZ.D1.DE73.fsh
@@ -1,9 +1,12 @@
-ValueSet:     IMMZ.D1.DE73
-Title:        "IMMZ.D1.DE73 ValueSet for Type of hepatitis A dose"
-Description:  "ValueSet for Type of hepatitis A dose for IMMZ.D1.DE73."
+ValueSet: IMMZ.D1.DE73
+Title: "IMMZ.D1.DE73 ValueSet for Type of hepatitis A dose"
+Description: "ValueSet for Type of hepatitis A dose for IMMZ.D1.DE73"
 
 * ^status = #active
 * ^name = "IMMZ_D1_DE73"
 
 * IMMZ.D1#DE74 "Live attenuated hepatitis A vaccine"
-* IMMZ.D1#DE75 "Inactivated hepatitis A vaccine"
\ No newline at end of file
+* IMMZ.D1#DE75 "Inactivated hepatitis A vaccine"
+* IMMZ.D1#DE99 "Type of hepatitis B dose"
+* IMMZ.D1#DE100 "Hepatitis B monovalent vaccine"
+* IMMZ.D1#DE101 "Hepatitis B combination vaccine"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE77.fsh b/input/fsh/valuesets/IMMZ.D1.DE77.fsh
new file mode 100644
index 0000000000..1b7c96bf43
--- /dev/null
+++ b/input/fsh/valuesets/IMMZ.D1.DE77.fsh
@@ -0,0 +1,10 @@
+ValueSet: IMMZ.D1.DE77
+Title: "IMMZ.D1.DE77 ValueSet for Dengue serostatus"
+Description: "ValueSet for Dengue serostatus for IMMZ.D1.DE77"
+
+* ^status = #active
+* ^name = "IMMZ_D1_DE77"
+
+* IMMZ.D1#DE110 "Positive"
+* IMMZ.D1#DE111 "Negative"
+* IMMZ.D1#DE112 "Unknown"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE84.fsh b/input/fsh/valuesets/IMMZ.D1.DE84.fsh
index decb6d623c..92c2edd6f5 100644
--- a/input/fsh/valuesets/IMMZ.D1.DE84.fsh
+++ b/input/fsh/valuesets/IMMZ.D1.DE84.fsh
@@ -1,10 +1,9 @@
-ValueSet:     IMMZ.D1.DE84
-Title:        "IMMZ.D1.DE84 ValueSet for Type of TB Test"
-Description:  "ValueSet for Type of TB infection test performed for IMMZ.D1.DE84."
+ValueSet: IMMZ.D1.DE84
+Title: "IMMZ.D1.DE84 ValueSet for Type of TB infection test performed"
+Description: "ValueSet for Type of TB infection test performed for IMMZ.D1.DE84"
 
 * ^status = #active
 * ^name = "IMMZ_D1_DE84"
 
-
 * IMMZ.D1#DE85 "IGRA"
-* IMMZ.D1#DE86 "TST"
\ No newline at end of file
+* IMMZ.D1#DE86 "TST"
diff --git a/input/fsh/valuesets/IMMZ.D1.DE87.fsh b/input/fsh/valuesets/IMMZ.D1.DE87.fsh
index d75c864f0a..3d217340fa 100644
--- a/input/fsh/valuesets/IMMZ.D1.DE87.fsh
+++ b/input/fsh/valuesets/IMMZ.D1.DE87.fsh
@@ -1,6 +1,6 @@
-ValueSet:     IMMZ.D1.DE87
-Title:        "IMMZ.D1.DE87 ValueSet for TB Test Result"
-Description:  "ValueSet for TB infection test result for IMMZ.D1.DE87."
+ValueSet: IMMZ.D1.DE87
+Title: "IMMZ.D1.DE87 ValueSet for TB infection test result"
+Description: "ValueSet for TB infection test result for IMMZ.D1.DE87"
 
 * ^status = #active
 * ^name = "IMMZ_D1_DE87"
diff --git a/input/fsh/valuesets/IMMZ.Z.DE23.fsh b/input/fsh/valuesets/IMMZ.Z.DE23.fsh
new file mode 100644
index 0000000000..7d85ec0ad6
--- /dev/null
+++ b/input/fsh/valuesets/IMMZ.Z.DE23.fsh
@@ -0,0 +1,12 @@
+ValueSet:     IMMZ.Z.DE23
+Title:        "IMMZ.Z.DE23 Yellow fever containing vaccines"
+Description:  "Vaccine terminology codes for yellow fever."
+
+* ^status = #active
+* ^name = "IMMZ_Z_DE23"
+
+
+* $ICD11#XM0N24	"Yellow fever vaccine"
+* $ICD11#XM3418	"Yellow fever, live attenuated"
+* $SCT#836385002 "Yellow fever virus antigen-containing vaccine product"
+* $SCT#1121000221106 "Live attenuated Yellow fever virus antigen only vaccine product"
diff --git a/input/fsh/valuesets/IMMZ.Z.DE9.fsh b/input/fsh/valuesets/IMMZ.Z.DE9.fsh
index 6159f86244..7a81c3b08b 100644
--- a/input/fsh/valuesets/IMMZ.Z.DE9.fsh
+++ b/input/fsh/valuesets/IMMZ.Z.DE9.fsh
@@ -1,6 +1,6 @@
 ValueSet:     IMMZ.Z.DE9
-Title:        "IMMZ.Z.DE10 ValueSet for Measles Vaccines"
-Description:  "ValueSet for Measles Vaccines for IMMZ.Z.DE9."
+Title:        "IMMZ.Z.DE9 ValueSet for Measles Vaccines"
+Description:  "Vaccine terminology codes for measles."
 
 * ^status = #active
 * ^name = "IMMZ_Z_DE9"
diff --git a/input/fsh/valuesets/LiveAttenuatedVaccines.fsh b/input/fsh/valuesets/LiveAttenuatedVaccines.fsh
index ca9117a950..6cc860cf44 100644
--- a/input/fsh/valuesets/LiveAttenuatedVaccines.fsh
+++ b/input/fsh/valuesets/LiveAttenuatedVaccines.fsh
@@ -34,5 +34,4 @@ Description: "Codes representing live attenuated vaccines"
 * $SCT#2221000221107
 * $ICD11#XM3418
 * $ICD11#XM5DF6
-* $ICD11#XM3418
 * $SCT#1121000221106
\ No newline at end of file
diff --git a/input/maps/IMMZD1LMToResources.fml b/input/maps/IMMZD1MeaslesLMToResources.fml
similarity index 87%
rename from input/maps/IMMZD1LMToResources.fml
rename to input/maps/IMMZD1MeaslesLMToResources.fml
index 0830d16c12..fb815808a2 100644
--- a/input/maps/IMMZD1LMToResources.fml
+++ b/input/maps/IMMZD1MeaslesLMToResources.fml
@@ -1,4 +1,4 @@
-map "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1LMToResources" = "IMMZD1LMToResources"
+map "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1MeaslesLMToResources" = "IMMZD1MeaslesLMToResources"
 
 uses "http://smart.who.int/ig/smart-immunizations/StructureDefinition/IMMZD1ClientHistoryMeasles" alias IMMZD1 as source
 uses "http://hl7.org/fhir/StructureDefinition/Bundle" alias Bundle as target
@@ -9,23 +9,36 @@ group IMMZD1ToBundle (source immz : IMMZD1, target bundle: Bundle) {
   immz.patient as patient then {
 
 
-    immz.dose0 as content -> bundle.entry as entry, entry.resource = create('Observation') as obs then {
+    immz.birth as content -> bundle.entry as entry, entry.resource = create('Observation') as obs then {
       patient -> obs.subject = patient "SetPatient";
       content -> obs.code as code then {
         content -> code.coding as coding then {
           content -> coding.system = 'http://smart.who.int/ig/smart-immunizations/CodeSystem/IMMZ.D1' "SetObsSystem";
-          content -> coding.code = 'DE80' "SetObsCode";
+          content -> coding.code = 'DE109' "SetObsCode";
         } "SetObsCoding";
       } "SetObsCode";
       content -> obs.value = content "SetValue";
-    } "SetDose0Observation";
+    } "SetBirthObservation";
 
+    immz.type as content -> bundle.entry as entry, entry.resource = create('Observation') as obs then {
+      patient -> obs.subject = patient "SetPatient";
+      content -> obs.code as code then {
+        content -> code.coding as coding then {
+          content -> coding.system = 'http://smart.who.int/ig/smart-immunizations/CodeSystem/IMMZ.D1' "SetObsSystem";
+          content -> coding.code = 'DE103' "SetObsCode";
+        } "SetObsCoding";
+      } "SetObsCode";
+      content -> obs.valueCodeableConcept as code then {
+        content -> code.coding = content "SetCoding";
+      } "SetCodeableConcept";
+    } "SetTypeObservation";
+    
     immz.booster as content -> bundle.entry as entry, entry.resource = create('Observation') as obs then {
       patient -> obs.subject = patient "SetPatient";
       content -> obs.code as code then {
         content -> code.coding as coding then {
           content -> coding.system = 'http://smart.who.int/ig/smart-immunizations/CodeSystem/IMMZ.D1' "SetObsSystem";
-          content -> coding.code = 'DE95' "SetObsCode";
+          content -> coding.code = 'DE102' "SetObsCode";
         } "SetObsCoding";
       } "SetObsCode";
       content -> obs.value = content "SetValue";
diff --git a/input/maps/IMMZD1QRToLM.fml b/input/maps/IMMZD1MeaslesQRToLM.fml
similarity index 88%
rename from input/maps/IMMZD1QRToLM.fml
rename to input/maps/IMMZD1MeaslesQRToLM.fml
index 40cfcebd5a..f6ba7e17da 100644
--- a/input/maps/IMMZD1QRToLM.fml
+++ b/input/maps/IMMZD1MeaslesQRToLM.fml
@@ -1,4 +1,4 @@
-map "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1QRToLM" = "IMMZD1QRToLM"
+map "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1MeaslesQRToLM" = "IMMZD1MeaslesQRToLM"
 
 uses "http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse" alias QResp as source
 uses "http://smart.who.int/ig/smart-immunizations/StructureDefinition/IMMZD1ClientHistoryMeasles" alias IMMZD1 as target
@@ -9,9 +9,13 @@ group QRespToIMMZD1 ( source qr : QResp, target immz : IMMZD1) {
 
   qr.item as item then {
 
-    item.answer first as answer where item.linkId = 'dose0' then {
-      answer.value as content -> immz.dose0 = content  "SetDose0";
-    } "FirstAnswerForDose0";
+    item.answer first as answer where item.linkId = 'birth' then {
+      answer.value as content -> immz.birth = content  "SetBirth";
+    } "FirstAnswerForBirth";
+
+    item.answer as answer where item.linkId = 'type' then {
+      answer.value as coding -> immz.type = coding "SetVaccineType";
+    } "AnswerForType";
 
     item.answer first as answer where item.linkId = 'booster' then {
       answer.value as content -> immz.booster = content  "SetBooster";
diff --git a/input/maps/IMMZD1QRToResources.fml b/input/maps/IMMZD1MeaslesQRToResources.fml
similarity index 88%
rename from input/maps/IMMZD1QRToResources.fml
rename to input/maps/IMMZD1MeaslesQRToResources.fml
index 3e5085acf0..417c7fae1f 100644
--- a/input/maps/IMMZD1QRToResources.fml
+++ b/input/maps/IMMZD1MeaslesQRToResources.fml
@@ -1,11 +1,11 @@
-map "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1QRToResources" = "IMMZD1QRToResources"
+map "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1MeaslesQRToResources" = "IMMZD1MeaslesQRToResources"
 
 uses "http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse" alias QResp as source
 uses "http://smart.who.int/ig/smart-immunizations/StructureDefinition/IMMZD1ClientHistoryMeasles" alias IMMZD1 as source
 uses "http://hl7.org/fhir/StructureDefinition/Bundle" alias Bundle as target
 
-imports "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1QRToLM"
-imports "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1LMToResources"
+imports "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1MeaslesQRToLM"
+imports "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1MeaslesLMToResources"
 
 group QRespToBundle (
   source qr : QResp,