diff --git a/input/fsh/questionnaires/HIV.A2.fsh b/input/fsh/questionnaires/HIV.A2.fsh
index c91bd38c770..792e35d4455 100644
--- a/input/fsh/questionnaires/HIV.A2.fsh
+++ b/input/fsh/questionnaires/HIV.A2.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.A.DE1"
   * linkId = "HIV.A.DE1"
diff --git a/input/fsh/questionnaires/HIV.A5.fsh b/input/fsh/questionnaires/HIV.A5.fsh
index 5437bab25bd..c54de81426e 100644
--- a/input/fsh/questionnaires/HIV.A5.fsh
+++ b/input/fsh/questionnaires/HIV.A5.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.A.DE8"
   * linkId = "HIV.A.DE8"
diff --git a/input/fsh/questionnaires/HIV.A6.1.fsh b/input/fsh/questionnaires/HIV.A6.1.fsh
index c7f8c3591d7..1bfb5dac2ad 100644
--- a/input/fsh/questionnaires/HIV.A6.1.fsh
+++ b/input/fsh/questionnaires/HIV.A6.1.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.A.DE8"
   * linkId = "HIV.A.DE8"
diff --git a/input/fsh/questionnaires/HIV.B1.fsh b/input/fsh/questionnaires/HIV.B1.fsh
index 347e66bf684..f1054ca1842 100644
--- a/input/fsh/questionnaires/HIV.B1.fsh
+++ b/input/fsh/questionnaires/HIV.B1.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.B.DE1"
   * linkId = "HIV.B.DE1"
diff --git a/input/fsh/questionnaires/HIV.B18.fsh b/input/fsh/questionnaires/HIV.B18.fsh
index d8306d7a78c..1eb755e9856 100644
--- a/input/fsh/questionnaires/HIV.B18.fsh
+++ b/input/fsh/questionnaires/HIV.B18.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.B.DE74"
   * linkId = "HIV.B.DE74"
diff --git a/input/fsh/questionnaires/HIV.B20.fsh b/input/fsh/questionnaires/HIV.B20.fsh
index 9c7e0aabd43..38464f6dcd0 100644
--- a/input/fsh/questionnaires/HIV.B20.fsh
+++ b/input/fsh/questionnaires/HIV.B20.fsh
@@ -9,6 +9,39 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.B.DE191"
+  * linkId = "HIV.B.DE191"
+  * type = #choice
+  * text = "Type of follow-up appointment"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE194"
+  * linkId = "HIV.B.DE194"
+  * type = #string
+  * text = "Other reason for the follow-up appointment (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE195"
+  * linkId = "HIV.B.DE195"
+  * type = #dateTime
+  * text = "Date/time of follow-up appointment"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE196"
+  * linkId = "HIV.B.DE196"
+  * type = #dateTime
+  * text = "Recommended follow-up date"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.B.DE224"
   * linkId = "HIV.B.DE224"
diff --git a/input/fsh/questionnaires/HIV.B21.fsh b/input/fsh/questionnaires/HIV.B21.fsh
index 50a963f3a77..7b9bc9f3923 100644
--- a/input/fsh/questionnaires/HIV.B21.fsh
+++ b/input/fsh/questionnaires/HIV.B21.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.B.DE197"
   * linkId = "HIV.B.DE197"
diff --git a/input/fsh/questionnaires/HIV.B23.fsh b/input/fsh/questionnaires/HIV.B23.fsh
index e1eec253c25..3ee22eb3fbb 100644
--- a/input/fsh/questionnaires/HIV.B23.fsh
+++ b/input/fsh/questionnaires/HIV.B23.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.B.DE226"
   * linkId = "HIV.B.DE226"
diff --git a/input/fsh/questionnaires/HIV.B6.fsh b/input/fsh/questionnaires/HIV.B6.fsh
index e78ba41d958..2639b3f4f71 100644
--- a/input/fsh/questionnaires/HIV.B6.fsh
+++ b/input/fsh/questionnaires/HIV.B6.fsh
@@ -9,6 +9,199 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.B.DE29"
+  * linkId = "HIV.B.DE29"
+  * type = #boolean
+  * text = "Currently pregnant"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE30"
+  * linkId = "HIV.B.DE30"
+  * type = #integer
+  * text = "Gestational age"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE31"
+  * linkId = "HIV.B.DE31"
+  * type = #date
+  * text = "Expected date of delivery (EDD)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE32"
+  * linkId = "HIV.B.DE32"
+  * type = #boolean
+  * text = "Breastfeeding"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE33"
+  * linkId = "HIV.B.DE33"
+  * type = #choice
+  * text = "Partner HIV status (reported)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE37"
+  * linkId = "HIV.B.DE37"
+  * type = #choice
+  * text = "Partner is from a key population"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE43"
+  * linkId = "HIV.B.DE43"
+  * type = #boolean
+  * text = "Has used an HIV self-test before (reported)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE44"
+  * linkId = "HIV.B.DE44"
+  * type = #choice
+  * text = "HIV self-test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE48"
+  * linkId = "HIV.B.DE48"
+  * type = #date
+  * text = "Date of HIV self-test"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE49"
+  * linkId = "HIV.B.DE49"
+  * type = #boolean
+  * text = "Key population member"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE50"
+  * linkId = "HIV.B.DE50"
+  * type = #choice
+  * text = "Key population member type"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE56"
+  * linkId = "HIV.B.DE56"
+  * type = #boolean
+  * text = "Adolescent girl"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE57"
+  * linkId = "HIV.B.DE57"
+  * type = #boolean
+  * text = "Young woman"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE58"
+  * linkId = "HIV.B.DE58"
+  * type = #boolean
+  * text = "Orphan or vulnerable child"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE59"
+  * linkId = "HIV.B.DE59"
+  * type = #boolean
+  * text = "Informed of HIV test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE60"
+  * linkId = "HIV.B.DE60"
+  * type = #date
+  * text = "Date HIV test results returned"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE61"
+  * linkId = "HIV.B.DE61"
+  * type = #choice
+  * text = "HIV exposure type"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE65"
+  * linkId = "HIV.B.DE65"
+  * type = #date
+  * text = "Date informed of HIV-positive diagnosis"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE66"
+  * linkId = "HIV.B.DE66"
+  * type = #choice
+  * text = "HIV diagnosing facility"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE67"
+  * linkId = "HIV.B.DE67"
+  * type = #date
+  * text = "Date of first positive test indicative of HIV diagnosis"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE136"
+  * linkId = "HIV.B.DE136"
+  * type = #choice
+  * text = "Partner HIV status (confirmed)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE140"
+  * linkId = "HIV.B.DE140"
+  * type = #boolean
+  * text = "Partner on ART"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE141"
+  * linkId = "HIV.B.DE141"
+  * type = #boolean
+  * text = "Partner virally suppressed on ART"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE225"
+  * linkId = "HIV.B.DE225"
+  * type = #boolean
+  * text = "At elevated risk for HIV acquisition"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.H.DE33"
   * linkId = "HIV.H.DE33"
diff --git a/input/fsh/questionnaires/HIV.B7.fsh b/input/fsh/questionnaires/HIV.B7.fsh
index c671b12b53e..cba3d76c6f9 100644
--- a/input/fsh/questionnaires/HIV.B7.fsh
+++ b/input/fsh/questionnaires/HIV.B7.fsh
@@ -9,6 +9,127 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.B.DE68"
+  * linkId = "HIV.B.DE68"
+  * type = #choice
+  * text = "HIV serotype"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE79"
+  * linkId = "HIV.B.DE79"
+  * type = #boolean
+  * text = "HIV test ordered"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE80"
+  * linkId = "HIV.B.DE80"
+  * type = #boolean
+  * text = "HIV test conducted"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE81"
+  * linkId = "HIV.B.DE81"
+  * type = #choice
+  * text = "HIV test type"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE87"
+  * linkId = "HIV.B.DE87"
+  * type = #dateTime
+  * text = "Date HIV test sent"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE88"
+  * linkId = "HIV.B.DE88"
+  * type = #choice
+  * text = "Assay number in testing strategy"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE94"
+  * linkId = "HIV.B.DE94"
+  * type = #choice
+  * text = "Test result of HIV assay 1"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE98"
+  * linkId = "HIV.B.DE98"
+  * type = #choice
+  * text = "Test result of HIV assay 2"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE102"
+  * linkId = "HIV.B.DE102"
+  * type = #choice
+  * text = "Test result of HIV assay 3"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE106"
+  * linkId = "HIV.B.DE106"
+  * type = #choice
+  * text = "Test result of HIV assay 1 repeated"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE110"
+  * linkId = "HIV.B.DE110"
+  * type = #date
+  * text = "HIV test date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE111"
+  * linkId = "HIV.B.DE111"
+  * type = #choice
+  * text = "HIV test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE115"
+  * linkId = "HIV.B.DE115"
+  * type = #choice
+  * text = "HIV status"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE119"
+  * linkId = "HIV.B.DE119"
+  * type = #date
+  * text = "Date positive HIV test confirmed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE120"
+  * linkId = "HIV.B.DE120"
+  * type = #choice
+  * text = "Site where positive HIV test confirmed"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.B.DE129"
   * linkId = "HIV.B.DE129"
diff --git a/input/fsh/questionnaires/HIV.B8.fsh b/input/fsh/questionnaires/HIV.B8.fsh
index 2ec3a468821..80d5be57b6b 100644
--- a/input/fsh/questionnaires/HIV.B8.fsh
+++ b/input/fsh/questionnaires/HIV.B8.fsh
@@ -9,6 +9,39 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.B.DE71"
+  * linkId = "HIV.B.DE71"
+  * type = #date
+  * text = "HIV diagnosis date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE72"
+  * linkId = "HIV.B.DE72"
+  * type = #date
+  * text = "ART start date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE73"
+  * linkId = "HIV.B.DE73"
+  * type = #integer
+  * text = "Age at diagnosis"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.B.DE121"
+  * linkId = "HIV.B.DE121"
+  * type = #choice
+  * text = "Probable route of transmission"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.B.DE142"
   * linkId = "HIV.B.DE142"
diff --git a/input/fsh/questionnaires/HIV.B9.fsh b/input/fsh/questionnaires/HIV.B9.fsh
index 79b31bef6fb..5bdae6321f6 100644
--- a/input/fsh/questionnaires/HIV.B9.fsh
+++ b/input/fsh/questionnaires/HIV.B9.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.B.DE149"
   * linkId = "HIV.B.DE149"
diff --git a/input/fsh/questionnaires/HIV.C1.fsh b/input/fsh/questionnaires/HIV.C1.fsh
index acb95f2c701..a344aab3f6f 100644
--- a/input/fsh/questionnaires/HIV.C1.fsh
+++ b/input/fsh/questionnaires/HIV.C1.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.C.DE1"
   * linkId = "HIV.C.DE1"
diff --git a/input/fsh/questionnaires/HIV.C10.fsh b/input/fsh/questionnaires/HIV.C10.fsh
index 7de8fc57aaf..47894adc53f 100644
--- a/input/fsh/questionnaires/HIV.C10.fsh
+++ b/input/fsh/questionnaires/HIV.C10.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.C.DE131"
   * linkId = "HIV.C.DE131"
diff --git a/input/fsh/questionnaires/HIV.C17.fsh b/input/fsh/questionnaires/HIV.C17.fsh
index e4772f2039a..cfc5cff59e2 100644
--- a/input/fsh/questionnaires/HIV.C17.fsh
+++ b/input/fsh/questionnaires/HIV.C17.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.C.DE63"
   * linkId = "HIV.C.DE63"
diff --git a/input/fsh/questionnaires/HIV.C21.fsh b/input/fsh/questionnaires/HIV.C21.fsh
index a4c7092e9e8..9a41fddbadf 100644
--- a/input/fsh/questionnaires/HIV.C21.fsh
+++ b/input/fsh/questionnaires/HIV.C21.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.C.DE71"
   * linkId = "HIV.C.DE71"
diff --git a/input/fsh/questionnaires/HIV.C23.fsh b/input/fsh/questionnaires/HIV.C23.fsh
index 89632315430..fb5db7a4343 100644
--- a/input/fsh/questionnaires/HIV.C23.fsh
+++ b/input/fsh/questionnaires/HIV.C23.fsh
@@ -9,6 +9,111 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.C.DE73"
+  * linkId = "HIV.C.DE73"
+  * type = #date
+  * text = "Date medications dispensed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE74"
+  * linkId = "HIV.C.DE74"
+  * type = #date
+  * text = "Date medications prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE75"
+  * linkId = "HIV.C.DE75"
+  * type = #choice
+  * text = "Medications prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE79"
+  * linkId = "HIV.C.DE79"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE80"
+  * linkId = "HIV.C.DE80"
+  * type = #choice
+  * text = "PrEP product prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE85"
+  * linkId = "HIV.C.DE85"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE86"
+  * linkId = "HIV.C.DE86"
+  * type = #date
+  * text = "Date PrEP prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE87"
+  * linkId = "HIV.C.DE87"
+  * type = #date
+  * text = "Date PrEP dispensed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE88"
+  * linkId = "HIV.C.DE88"
+  * type = #integer
+  * text = "Volume of PrEP product prescribed/dispensed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE89"
+  * linkId = "HIV.C.DE89"
+  * type = #date
+  * text = "Date PEP prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE90"
+  * linkId = "HIV.C.DE90"
+  * type = #date
+  * text = "Date PEP course completion"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE91"
+  * linkId = "HIV.C.DE91"
+  * type = #choice
+  * text = "Preferred PEP backbone regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE99"
+  * linkId = "HIV.C.DE99"
+  * type = #choice
+  * text = "Preferred third PEP drug"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.C.DE106"
   * linkId = "HIV.C.DE106"
diff --git a/input/fsh/questionnaires/HIV.C24.fsh b/input/fsh/questionnaires/HIV.C24.fsh
index 2bbc899af80..fbf217ce567 100644
--- a/input/fsh/questionnaires/HIV.C24.fsh
+++ b/input/fsh/questionnaires/HIV.C24.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.C.DE124"
   * linkId = "HIV.C.DE124"
diff --git a/input/fsh/questionnaires/HIV.C3.fsh b/input/fsh/questionnaires/HIV.C3.fsh
index 0064a6ff137..2c6c0b1ae7a 100644
--- a/input/fsh/questionnaires/HIV.C3.fsh
+++ b/input/fsh/questionnaires/HIV.C3.fsh
@@ -9,6 +9,159 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.C.DE8"
+  * linkId = "HIV.C.DE8"
+  * type = #boolean
+  * text = "Contact with and (suspected) exposure to HIV"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE9"
+  * linkId = "HIV.C.DE9"
+  * type = #dateTime
+  * text = "Date/time of suspected exposure to HIV"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE10"
+  * linkId = "HIV.C.DE10"
+  * type = #boolean
+  * text = "Currently on PrEP"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE11"
+  * linkId = "HIV.C.DE11"
+  * type = #choice
+  * text = "PrEP dosing type"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE15"
+  * linkId = "HIV.C.DE15"
+  * type = #string
+  * text = "Other PrEP dosing type (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE16"
+  * linkId = "HIV.C.DE16"
+  * type = #boolean
+  * text = "Used event-driven PrEP for at risk exposures over the past 3 months"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE17"
+  * linkId = "HIV.C.DE17"
+  * type = #choice
+  * text = "Current PrEP regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE24"
+  * linkId = "HIV.C.DE24"
+  * type = #choice
+  * text = "Experience with PrEP"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE28"
+  * linkId = "HIV.C.DE28"
+  * type = #date
+  * text = "PrEP start date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE29"
+  * linkId = "HIV.C.DE29"
+  * type = #boolean
+  * text = "Stopped PrEP"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE30"
+  * linkId = "HIV.C.DE30"
+  * type = #date
+  * text = "Date PrEP stopped"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE31"
+  * linkId = "HIV.C.DE31"
+  * type = #choice
+  * text = "PEP history"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE34"
+  * linkId = "HIV.C.DE34"
+  * type = #date
+  * text = "Date(s) of past PEP use"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE35"
+  * linkId = "HIV.C.DE35"
+  * type = #date
+  * text = "Date client completes PEP course"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE36"
+  * linkId = "HIV.C.DE36"
+  * type = #choice
+  * text = "Signs of substantial risk of HIV infection"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE41"
+  * linkId = "HIV.C.DE41"
+  * type = #choice
+  * text = "Pregnancy intention in serodiscordant partnerships"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE46"
+  * linkId = "HIV.C.DE46"
+  * type = #choice
+  * text = "Acute HIV infection symptoms"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE55"
+  * linkId = "HIV.C.DE55"
+  * type = #choice
+  * text = "Sex partner's HIV treatment status"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.C.DE95"
+  * linkId = "HIV.C.DE95"
+  * type = #choice
+  * text = "Alternative PEP backbone regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.C.DE101"
   * linkId = "HIV.C.DE101"
diff --git a/input/fsh/questionnaires/HIV.C6.fsh b/input/fsh/questionnaires/HIV.C6.fsh
index 8a3e4ee83c2..ab51b579f88 100644
--- a/input/fsh/questionnaires/HIV.C6.fsh
+++ b/input/fsh/questionnaires/HIV.C6.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.C.DE130"
   * linkId = "HIV.C.DE130"
diff --git a/input/fsh/questionnaires/HIV.C8.fsh b/input/fsh/questionnaires/HIV.C8.fsh
index 4cf7f58cb9d..5514541d1bd 100644
--- a/input/fsh/questionnaires/HIV.C8.fsh
+++ b/input/fsh/questionnaires/HIV.C8.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.C.DE61"
   * linkId = "HIV.C.DE61"
diff --git a/input/fsh/questionnaires/HIV.D1.fsh b/input/fsh/questionnaires/HIV.D1.fsh
index da2cd018db8..a967791437d 100644
--- a/input/fsh/questionnaires/HIV.D1.fsh
+++ b/input/fsh/questionnaires/HIV.D1.fsh
@@ -9,6 +9,23 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE1"
+  * linkId = "HIV.D.DE1"
+  * type = #choice
+  * text = "Reason for visit"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE8"
+  * linkId = "HIV.D.DE8"
+  * type = #boolean
+  * text = "Scheduled visit"
+  * required = true
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE746"
   * linkId = "HIV.D.DE746"
diff --git a/input/fsh/questionnaires/HIV.D10.fsh b/input/fsh/questionnaires/HIV.D10.fsh
index 882b8c2e87a..8875084333d 100644
--- a/input/fsh/questionnaires/HIV.D10.fsh
+++ b/input/fsh/questionnaires/HIV.D10.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.D.DE192"
   * linkId = "HIV.D.DE192"
diff --git a/input/fsh/questionnaires/HIV.D12.fsh b/input/fsh/questionnaires/HIV.D12.fsh
index fc91cbecb26..7c0adebef98 100644
--- a/input/fsh/questionnaires/HIV.D12.fsh
+++ b/input/fsh/questionnaires/HIV.D12.fsh
@@ -9,6 +9,143 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE152"
+  * linkId = "HIV.D.DE152"
+  * type = #choice
+  * text = "Prevention services offered and referrals"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE156"
+  * linkId = "HIV.D.DE156"
+  * type = #choice
+  * text = "Sexual and reproductive health integrated services"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE161"
+  * linkId = "HIV.D.DE161"
+  * type = #date
+  * text = "HBsAg test date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE162"
+  * linkId = "HIV.D.DE162"
+  * type = #choice
+  * text = "HBsAg test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE166"
+  * linkId = "HIV.D.DE166"
+  * type = #date
+  * text = "Date HBV test result returned to client"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE167"
+  * linkId = "HIV.D.DE167"
+  * type = #date
+  * text = "HBV treatment (TDF) start date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE168"
+  * linkId = "HIV.D.DE168"
+  * type = #choice
+  * text = "HBV treatment regimen prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE169"
+  * linkId = "HIV.D.DE169"
+  * type = #date
+  * text = "HCV test date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE170"
+  * linkId = "HIV.D.DE170"
+  * type = #choice
+  * text = "HCV test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE174"
+  * linkId = "HIV.D.DE174"
+  * type = #date
+  * text = "Date HCV test result returned to client"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE175"
+  * linkId = "HIV.D.DE175"
+  * type = #date
+  * text = "HCV treatment start date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE176"
+  * linkId = "HIV.D.DE176"
+  * type = #date
+  * text = "HCV treatment completion date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE177"
+  * linkId = "HIV.D.DE177"
+  * type = #choice
+  * text = "HCV treatment regimen prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE178"
+  * linkId = "HIV.D.DE178"
+  * type = #date
+  * text = "HCV viral load test date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE179"
+  * linkId = "HIV.D.DE179"
+  * type = #choice
+  * text = "HCV viral load test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE182"
+  * linkId = "HIV.D.DE182"
+  * type = #choice
+  * text = "HCV medicine type"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE185"
+  * linkId = "HIV.D.DE185"
+  * type = #boolean
+  * text = "Currently on TDF-based ART"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE229"
   * linkId = "HIV.D.DE229"
diff --git a/input/fsh/questionnaires/HIV.D14.fsh b/input/fsh/questionnaires/HIV.D14.fsh
index 849f05d937d..e503da4b819 100644
--- a/input/fsh/questionnaires/HIV.D14.fsh
+++ b/input/fsh/questionnaires/HIV.D14.fsh
@@ -9,6 +9,23 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE259"
+  * linkId = "HIV.D.DE259"
+  * type = #choice
+  * text = "Risk factors, comorbidities and coinfections signs and symptoms"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE288"
+  * linkId = "HIV.D.DE288"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE1017"
   * linkId = "HIV.D.DE1017"
diff --git a/input/fsh/questionnaires/HIV.D15.fsh b/input/fsh/questionnaires/HIV.D15.fsh
index f1172eec944..818ef596464 100644
--- a/input/fsh/questionnaires/HIV.D15.fsh
+++ b/input/fsh/questionnaires/HIV.D15.fsh
@@ -9,6 +9,31 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE289"
+  * linkId = "HIV.D.DE289"
+  * type = #choice
+  * text = "WHO HIV clinical stage condition or symptom"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE358"
+  * linkId = "HIV.D.DE358"
+  * type = #choice
+  * text = "Clinical stage at start of ART"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE363"
+  * linkId = "HIV.D.DE363"
+  * type = #date
+  * text = "Date of clinical status change"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE934"
   * linkId = "HIV.D.DE934"
diff --git a/input/fsh/questionnaires/HIV.D16.fsh b/input/fsh/questionnaires/HIV.D16.fsh
index e1ab4d3b8a4..bb45e220b33 100644
--- a/input/fsh/questionnaires/HIV.D16.fsh
+++ b/input/fsh/questionnaires/HIV.D16.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.D.DE884"
   * linkId = "HIV.D.DE884"
diff --git a/input/fsh/questionnaires/HIV.D17.fsh b/input/fsh/questionnaires/HIV.D17.fsh
index 3c904712b9d..fa6e504b73a 100644
--- a/input/fsh/questionnaires/HIV.D17.fsh
+++ b/input/fsh/questionnaires/HIV.D17.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.D.DE225"
   * linkId = "HIV.D.DE225"
diff --git a/input/fsh/questionnaires/HIV.D19.fsh b/input/fsh/questionnaires/HIV.D19.fsh
index d157276964f..3a0cb80f2af 100644
--- a/input/fsh/questionnaires/HIV.D19.fsh
+++ b/input/fsh/questionnaires/HIV.D19.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.D.DE602"
   * linkId = "HIV.D.DE602"
diff --git a/input/fsh/questionnaires/HIV.D2.fsh b/input/fsh/questionnaires/HIV.D2.fsh
index f9ac6c47890..dd3cf71eebf 100644
--- a/input/fsh/questionnaires/HIV.D2.fsh
+++ b/input/fsh/questionnaires/HIV.D2.fsh
@@ -9,6 +9,71 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE9"
+  * linkId = "HIV.D.DE9"
+  * type = #integer
+  * text = "Body temperature"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE10"
+  * linkId = "HIV.D.DE10"
+  * type = #integer
+  * text = "Respiratory rate"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE11"
+  * linkId = "HIV.D.DE11"
+  * type = #integer
+  * text = "Heart rate"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE12"
+  * linkId = "HIV.D.DE12"
+  * type = #integer
+  * text = "Body height"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE13"
+  * linkId = "HIV.D.DE13"
+  * type = #integer
+  * text = "Body weight"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE14"
+  * linkId = "HIV.D.DE14"
+  * type = #integer
+  * text = "Systolic blood pressure"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE15"
+  * linkId = "HIV.D.DE15"
+  * type = #integer
+  * text = "Diastolic blood pressure"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE16"
+  * linkId = "HIV.D.DE16"
+  * type = #boolean
+  * text = "Blood pressure cannot be taken"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE532"
   * linkId = "HIV.D.DE532"
diff --git a/input/fsh/questionnaires/HIV.D20.fsh b/input/fsh/questionnaires/HIV.D20.fsh
index 66548ac55d0..71073a21f99 100644
--- a/input/fsh/questionnaires/HIV.D20.fsh
+++ b/input/fsh/questionnaires/HIV.D20.fsh
@@ -9,6 +9,191 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE364"
+  * linkId = "HIV.D.DE364"
+  * type = #integer
+  * text = "CD4 count"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE365"
+  * linkId = "HIV.D.DE365"
+  * type = #integer
+  * text = "CD4 cell percentage"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE366"
+  * linkId = "HIV.D.DE366"
+  * type = #dateTime
+  * text = "Date of CD4 count test"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE367"
+  * linkId = "HIV.D.DE367"
+  * type = #integer
+  * text = "Baseline CD4 count"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE368"
+  * linkId = "HIV.D.DE368"
+  * type = #dateTime
+  * text = "Date of baseline CD4 count test"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE369"
+  * linkId = "HIV.D.DE369"
+  * type = #boolean
+  * text = "Late ART initiation"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE387"
+  * linkId = "HIV.D.DE387"
+  * type = #integer
+  * text = "Viral load test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE388"
+  * linkId = "HIV.D.DE388"
+  * type = #boolean
+  * text = "Virally suppressed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE389"
+  * linkId = "HIV.D.DE389"
+  * type = #date
+  * text = "Date viral load test results received"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE390"
+  * linkId = "HIV.D.DE390"
+  * type = #date
+  * text = "Viral load suppression date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE391"
+  * linkId = "HIV.D.DE391"
+  * type = #choice
+  * text = "Reason for HIV viral load test"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE396"
+  * linkId = "HIV.D.DE396"
+  * type = #boolean
+  * text = "Hepatitis B test required"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE397"
+  * linkId = "HIV.D.DE397"
+  * type = #boolean
+  * text = "Hepatitis C test recommended"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE398"
+  * linkId = "HIV.D.DE398"
+  * type = #boolean
+  * text = "Syphilis test required"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE399"
+  * linkId = "HIV.D.DE399"
+  * type = #choice
+  * text = "Monitoring examinations"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE414"
+  * linkId = "HIV.D.DE414"
+  * type = #boolean
+  * text = "Hepatitis C test ordered"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE415"
+  * linkId = "HIV.D.DE415"
+  * type = #boolean
+  * text = "Syphilis test ordered"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE416"
+  * linkId = "HIV.D.DE416"
+  * type = #boolean
+  * text = "Received viral load test results"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE417"
+  * linkId = "HIV.D.DE417"
+  * type = #date
+  * text = "Date viral load test results received by client"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE1024"
+  * linkId = "HIV.D.DE1024"
+  * type = #boolean
+  * text = "TB meningitis"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE149"
+  * linkId = "HIV.E.DE149"
+  * type = #choice
+  * text = "Maternal syphilis test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE153"
+  * linkId = "HIV.E.DE153"
+  * type = #boolean
+  * text = "Hypertension"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE154"
+  * linkId = "HIV.E.DE154"
+  * type = #boolean
+  * text = "Pre-eclampsia"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.G.DE1"
   * linkId = "HIV.G.DE1"
diff --git a/input/fsh/questionnaires/HIV.D21.fsh b/input/fsh/questionnaires/HIV.D21.fsh
index 53a0713d7af..2d3642f3042 100644
--- a/input/fsh/questionnaires/HIV.D21.fsh
+++ b/input/fsh/questionnaires/HIV.D21.fsh
@@ -9,6 +9,295 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE418"
+  * linkId = "HIV.D.DE418"
+  * type = #choice
+  * text = "Reason for ARV drug regimen substitution"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE426"
+  * linkId = "HIV.D.DE426"
+  * type = #string
+  * text = "Other reason for regimen substitution (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE427"
+  * linkId = "HIV.D.DE427"
+  * type = #boolean
+  * text = "Switch to second-line ART regimen recommended"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE428"
+  * linkId = "HIV.D.DE428"
+  * type = #boolean
+  * text = "Switch to third-line ART regimen recommended"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE466"
+  * linkId = "HIV.D.DE466"
+  * type = #choice
+  * text = "Type of treatment-limiting toxicity"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE480"
+  * linkId = "HIV.D.DE480"
+  * type = #string
+  * text = "Unexpected adverse drug reaction (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE481"
+  * linkId = "HIV.D.DE481"
+  * type = #date
+  * text = "Date(s) of substitution within first-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE482"
+  * linkId = "HIV.D.DE482"
+  * type = #choice
+  * text = "Reason(s) for substitution within first-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE483"
+  * linkId = "HIV.D.DE483"
+  * type = #choice
+  * text = "New antiretroviral regimen after substitution within first-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE484"
+  * linkId = "HIV.D.DE484"
+  * type = #date
+  * text = "Date of switch to second-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE485"
+  * linkId = "HIV.D.DE485"
+  * type = #choice
+  * text = "New regimen after switch to second-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE486"
+  * linkId = "HIV.D.DE486"
+  * type = #choice
+  * text = "Reason for switch to second-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE487"
+  * linkId = "HIV.D.DE487"
+  * type = #date
+  * text = "Date(s) of substitution within second-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE488"
+  * linkId = "HIV.D.DE488"
+  * type = #choice
+  * text = "Reason(s) for substitution within second-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE489"
+  * linkId = "HIV.D.DE489"
+  * type = #choice
+  * text = "New regimen(s) after substitution within second-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE490"
+  * linkId = "HIV.D.DE490"
+  * type = #date
+  * text = "Date of switch to third-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE491"
+  * linkId = "HIV.D.DE491"
+  * type = #choice
+  * text = "New regimen after switch to third-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE492"
+  * linkId = "HIV.D.DE492"
+  * type = #choice
+  * text = "Reason for switch to third-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE493"
+  * linkId = "HIV.D.DE493"
+  * type = #date
+  * text = "Date(s) of substitution within third-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE494"
+  * linkId = "HIV.D.DE494"
+  * type = #choice
+  * text = "Reason(s) for substitution within third-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE495"
+  * linkId = "HIV.D.DE495"
+  * type = #choice
+  * text = "New regimen(s) after substitution within third-line regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE643"
+  * linkId = "HIV.D.DE643"
+  * type = #boolean
+  * text = "Malaria prophylaxis"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE644"
+  * linkId = "HIV.D.DE644"
+  * type = #integer
+  * text = "IPTp-SP dose number provided"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE645"
+  * linkId = "HIV.D.DE645"
+  * type = #date
+  * text = "Date IPTp-SP dose provided"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE646"
+  * linkId = "HIV.D.DE646"
+  * type = #choice
+  * text = "Reason malaria prophylaxis not provided"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE651"
+  * linkId = "HIV.D.DE651"
+  * type = #string
+  * text = "Other reason not provided (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE652"
+  * linkId = "HIV.D.DE652"
+  * type = #boolean
+  * text = ">28 days since last missed appointment"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE760"
+  * linkId = "HIV.D.DE760"
+  * type = #boolean
+  * text = "Eligible for DSD ART"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE761"
+  * linkId = "HIV.D.DE761"
+  * type = #date
+  * text = "Date DSD ART eligibility assessed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE762"
+  * linkId = "HIV.D.DE762"
+  * type = #boolean
+  * text = "Currently enrolled in DSD ART model"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE763"
+  * linkId = "HIV.D.DE763"
+  * type = #date
+  * text = "DSD ART start date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE764"
+  * linkId = "HIV.D.DE764"
+  * type = #choice
+  * text = "DSD ART model(s)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE771"
+  * linkId = "HIV.D.DE771"
+  * type = #string
+  * text = "Other DSD ART model (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE903"
+  * linkId = "HIV.D.DE903"
+  * type = #choice
+  * text = "Medication/drug"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE932"
+  * linkId = "HIV.D.DE932"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE933"
+  * linkId = "HIV.D.DE933"
+  * type = #boolean
+  * text = "Medication change recommended"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE1023"
   * linkId = "HIV.D.DE1023"
diff --git a/input/fsh/questionnaires/HIV.D23.fsh b/input/fsh/questionnaires/HIV.D23.fsh
index 65be0a937c9..976b4e7d6c8 100644
--- a/input/fsh/questionnaires/HIV.D23.fsh
+++ b/input/fsh/questionnaires/HIV.D23.fsh
@@ -9,6 +9,175 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE429"
+  * linkId = "HIV.D.DE429"
+  * type = #boolean
+  * text = "Regimen switch made"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE430"
+  * linkId = "HIV.D.DE430"
+  * type = #choice
+  * text = "Reason for regimen switch"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE435"
+  * linkId = "HIV.D.DE435"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE436"
+  * linkId = "HIV.D.DE436"
+  * type = #boolean
+  * text = "Regimen substitution recommended"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE437"
+  * linkId = "HIV.D.DE437"
+  * type = #boolean
+  * text = "Dose adjustment recommended"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE438"
+  * linkId = "HIV.D.DE438"
+  * type = #boolean
+  * text = "Regimen substitution made"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE439"
+  * linkId = "HIV.D.DE439"
+  * type = #date
+  * text = "Co-trimoxazole prophylaxis start date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE440"
+  * linkId = "HIV.D.DE440"
+  * type = #date
+  * text = "Co-trimoxazole prophylaxis completion date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE441"
+  * linkId = "HIV.D.DE441"
+  * type = #integer
+  * text = "Co-trimoxazole prophylaxis dosage"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE442"
+  * linkId = "HIV.D.DE442"
+  * type = #integer
+  * text = "Co-trimoxazole prophylaxis number of days prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE443"
+  * linkId = "HIV.D.DE443"
+  * type = #boolean
+  * text = "Suspicion of treatment failure or interruption"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE444"
+  * linkId = "HIV.D.DE444"
+  * type = #choice
+  * text = "ART regimen prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE445"
+  * linkId = "HIV.D.DE445"
+  * type = #boolean
+  * text = "Antiretroviral toxicity"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE457"
+  * linkId = "HIV.D.DE457"
+  * type = #choice
+  * text = "Medications prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE458"
+  * linkId = "HIV.D.DE458"
+  * type = #date
+  * text = "Date medications prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE459"
+  * linkId = "HIV.D.DE459"
+  * type = #integer
+  * text = "Dose of medications prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE460"
+  * linkId = "HIV.D.DE460"
+  * type = #integer
+  * text = "Number of days medications prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE461"
+  * linkId = "HIV.D.DE461"
+  * type = #choice
+  * text = "Medications dispensed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE462"
+  * linkId = "HIV.D.DE462"
+  * type = #integer
+  * text = "Number of days of medications dispensed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE463"
+  * linkId = "HIV.D.DE463"
+  * type = #integer
+  * text = "Dosage"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE464"
+  * linkId = "HIV.D.DE464"
+  * type = #integer
+  * text = "Frequency"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE1019"
   * linkId = "HIV.D.DE1019"
diff --git a/input/fsh/questionnaires/HIV.D24.fsh b/input/fsh/questionnaires/HIV.D24.fsh
index f40db3c824d..c4f983f6f46 100644
--- a/input/fsh/questionnaires/HIV.D24.fsh
+++ b/input/fsh/questionnaires/HIV.D24.fsh
@@ -9,6 +9,47 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE446"
+  * linkId = "HIV.D.DE446"
+  * type = #choice
+  * text = "Coinfection status at ART start"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE449"
+  * linkId = "HIV.D.DE449"
+  * type = #choice
+  * text = "Pregnant and breastfeeding status at ART start"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE454"
+  * linkId = "HIV.D.DE454"
+  * type = #date
+  * text = "Delivery date of infant"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE455"
+  * linkId = "HIV.D.DE455"
+  * type = #boolean
+  * text = "Serodiscordant partner at ART start"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE465"
+  * linkId = "HIV.D.DE465"
+  * type = #boolean
+  * text = "Adherence counselling provided"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE496"
   * linkId = "HIV.D.DE496"
diff --git a/input/fsh/questionnaires/HIV.D25.fsh b/input/fsh/questionnaires/HIV.D25.fsh
index 438be496896..27d7b85632b 100644
--- a/input/fsh/questionnaires/HIV.D25.fsh
+++ b/input/fsh/questionnaires/HIV.D25.fsh
@@ -9,6 +9,63 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE512"
+  * linkId = "HIV.D.DE512"
+  * type = #boolean
+  * text = "Accepted partner services"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE513"
+  * linkId = "HIV.D.DE513"
+  * type = #boolean
+  * text = "HIV testing for partners and biological children"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE514"
+  * linkId = "HIV.D.DE514"
+  * type = #choice
+  * text = "HIV status of family member"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE515"
+  * linkId = "HIV.D.DE515"
+  * type = #string
+  * text = "Unique ID of family member"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE516"
+  * linkId = "HIV.D.DE516"
+  * type = #date
+  * text = "Date of death of family member"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE517"
+  * linkId = "HIV.D.DE517"
+  * type = #boolean
+  * text = "Offered voluntary partner services"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE518"
+  * linkId = "HIV.D.DE518"
+  * type = #boolean
+  * text = "Provided support for disclosure and partner services"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE772"
   * linkId = "HIV.D.DE772"
diff --git a/input/fsh/questionnaires/HIV.D26.fsh b/input/fsh/questionnaires/HIV.D26.fsh
index ce4cd9f9bf8..59fc5f41c68 100644
--- a/input/fsh/questionnaires/HIV.D26.fsh
+++ b/input/fsh/questionnaires/HIV.D26.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.D.DE778"
   * linkId = "HIV.D.DE778"
diff --git a/input/fsh/questionnaires/HIV.D28.fsh b/input/fsh/questionnaires/HIV.D28.fsh
index b89a1ced304..4418e8ff048 100644
--- a/input/fsh/questionnaires/HIV.D28.fsh
+++ b/input/fsh/questionnaires/HIV.D28.fsh
@@ -9,6 +9,287 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE413"
+  * linkId = "HIV.D.DE413"
+  * type = #date
+  * text = "Date of scheduled monitoring examination"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE519"
+  * linkId = "HIV.D.DE519"
+  * type = #choice
+  * text = "Other support services"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE656"
+  * linkId = "HIV.D.DE656"
+  * type = #dateTime
+  * text = "Date of cervical cancer screening test"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE657"
+  * linkId = "HIV.D.DE657"
+  * type = #integer
+  * text = "Lifetime screening test number"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE658"
+  * linkId = "HIV.D.DE658"
+  * type = #choice
+  * text = "Cervical cancer primary screening test type"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE663"
+  * linkId = "HIV.D.DE663"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE664"
+  * linkId = "HIV.D.DE664"
+  * type = #choice
+  * text = "HPV-DNA cervical cancer screening test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE668"
+  * linkId = "HIV.D.DE668"
+  * type = #choice
+  * text = "VIA cervical cancer screening test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE673"
+  * linkId = "HIV.D.DE673"
+  * type = #choice
+  * text = "Cervical cytology screening test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE680"
+  * linkId = "HIV.D.DE680"
+  * type = #dateTime
+  * text = "Cervical cancer triage test date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE681"
+  * linkId = "HIV.D.DE681"
+  * type = #choice
+  * text = "Cervical cancer triage test type"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE687"
+  * linkId = "HIV.D.DE687"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE688"
+  * linkId = "HIV.D.DE688"
+  * type = #choice
+  * text = "HPV16/18 test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE691"
+  * linkId = "HIV.D.DE691"
+  * type = #choice
+  * text = "Cervical cancer colposcopy result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE697"
+  * linkId = "HIV.D.DE697"
+  * type = #choice
+  * text = "Cervical cancer histopathology result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE702"
+  * linkId = "HIV.D.DE702"
+  * type = #string
+  * text = "Date of additional cervical cancer triage test"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE703"
+  * linkId = "HIV.D.DE703"
+  * type = #string
+  * text = "Additional cervical cancer triage test type (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE704"
+  * linkId = "HIV.D.DE704"
+  * type = #string
+  * text = "Additional cervical cancer triage test result (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE705"
+  * linkId = "HIV.D.DE705"
+  * type = #dateTime
+  * text = "Date of diagnosis of cervical precancer lesions or invasive cervical cancer"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE706"
+  * linkId = "HIV.D.DE706"
+  * type = #choice
+  * text = "Cervical cancer screening outcome"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE709"
+  * linkId = "HIV.D.DE709"
+  * type = #choice
+  * text = "Cervical cancer diagnosis"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE712"
+  * linkId = "HIV.D.DE712"
+  * type = #choice
+  * text = "Cervical cancer stage at diagnosis"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE718"
+  * linkId = "HIV.D.DE718"
+  * type = #dateTime
+  * text = "Date of treatment for cervical precancer lesions"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE719"
+  * linkId = "HIV.D.DE719"
+  * type = #choice
+  * text = "Treatment method for cervical precancer lesions"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE727"
+  * linkId = "HIV.D.DE727"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE728"
+  * linkId = "HIV.D.DE728"
+  * type = #dateTime
+  * text = "Date of follow-up for treatment for cervical precancer lesions"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE729"
+  * linkId = "HIV.D.DE729"
+  * type = #dateTime
+  * text = "Date of start of invasive cancer treatment"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE730"
+  * linkId = "HIV.D.DE730"
+  * type = #integer
+  * text = "Invasive cervical cancer treatment episode"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE731"
+  * linkId = "HIV.D.DE731"
+  * type = #choice
+  * text = "Invasive cervical cancer treatment method"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE740"
+  * linkId = "HIV.D.DE740"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE741"
+  * linkId = "HIV.D.DE741"
+  * type = #string
+  * text = "Treatment outcome"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE742"
+  * linkId = "HIV.D.DE742"
+  * type = #string
+  * text = "Secondary/other cancers diagnosed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE743"
+  * linkId = "HIV.D.DE743"
+  * type = #string
+  * text = "Cancers at other sites (HPV- and non-HPV related)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE744"
+  * linkId = "HIV.D.DE744"
+  * type = #dateTime
+  * text = "Date of death"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE745"
+  * linkId = "HIV.D.DE745"
+  * type = #integer
+  * text = "Cervical cancer screening interval amongst WLHIV"
+  * required = true
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE753"
   * linkId = "HIV.D.DE753"
diff --git a/input/fsh/questionnaires/HIV.D29.fsh b/input/fsh/questionnaires/HIV.D29.fsh
index 0ca267a891b..66faadc03b5 100644
--- a/input/fsh/questionnaires/HIV.D29.fsh
+++ b/input/fsh/questionnaires/HIV.D29.fsh
@@ -9,6 +9,39 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE524"
+  * linkId = "HIV.D.DE524"
+  * type = #dateTime
+  * text = "Date/time of follow-up appointment"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE525"
+  * linkId = "HIV.D.DE525"
+  * type = #choice
+  * text = "Type of follow-up appointment"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE530"
+  * linkId = "HIV.D.DE530"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE531"
+  * linkId = "HIV.D.DE531"
+  * type = #date
+  * text = "Follow-up test recommended date"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE776"
   * linkId = "HIV.D.DE776"
diff --git a/input/fsh/questionnaires/HIV.D3.fsh b/input/fsh/questionnaires/HIV.D3.fsh
index 7c3559f6c59..377a929f06d 100644
--- a/input/fsh/questionnaires/HIV.D3.fsh
+++ b/input/fsh/questionnaires/HIV.D3.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.D.DE17"
   * linkId = "HIV.D.DE17"
diff --git a/input/fsh/questionnaires/HIV.D4.fsh b/input/fsh/questionnaires/HIV.D4.fsh
index 664b4d10e23..48e573f5da1 100644
--- a/input/fsh/questionnaires/HIV.D4.fsh
+++ b/input/fsh/questionnaires/HIV.D4.fsh
@@ -9,6 +9,103 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE956"
+  * linkId = "HIV.D.DE956"
+  * type = #choice
+  * text = "TB screening algorithm"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE971"
+  * linkId = "HIV.D.DE971"
+  * type = #string
+  * text = "Other TB screening algorithm (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE972"
+  * linkId = "HIV.D.DE972"
+  * type = #boolean
+  * text = "TB screening conducted"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE973"
+  * linkId = "HIV.D.DE973"
+  * type = #choice
+  * text = "Symptoms of TB"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE985"
+  * linkId = "HIV.D.DE985"
+  * type = #boolean
+  * text = "History of contact with a person with TB"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE986"
+  * linkId = "HIV.D.DE986"
+  * type = #choice
+  * text = "TB screening result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE990"
+  * linkId = "HIV.D.DE990"
+  * type = #date
+  * text = "TB screening date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE991"
+  * linkId = "HIV.D.DE991"
+  * type = #date
+  * text = "TB screening result date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE992"
+  * linkId = "HIV.D.DE992"
+  * type = #choice
+  * text = "TB diagnostic test category"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE997"
+  * linkId = "HIV.D.DE997"
+  * type = #date
+  * text = "TB diagnostic test date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE998"
+  * linkId = "HIV.D.DE998"
+  * type = #date
+  * text = "Test sample collection date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE999"
+  * linkId = "HIV.D.DE999"
+  * type = #date
+  * text = "TB diagnostic test result date"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE1025"
   * linkId = "HIV.D.DE1025"
diff --git a/input/fsh/questionnaires/HIV.D8.fsh b/input/fsh/questionnaires/HIV.D8.fsh
index bb371421b24..c3602ca7db6 100644
--- a/input/fsh/questionnaires/HIV.D8.fsh
+++ b/input/fsh/questionnaires/HIV.D8.fsh
@@ -9,6 +9,559 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.D.DE31"
+  * linkId = "HIV.D.DE31"
+  * type = #boolean
+  * text = "Currently pregnant"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE32"
+  * linkId = "HIV.D.DE32"
+  * type = #boolean
+  * text = "Breastfeeding"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE33"
+  * linkId = "HIV.D.DE33"
+  * type = #integer
+  * text = "Number of pregnancies (gravida)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE34"
+  * linkId = "HIV.D.DE34"
+  * type = #integer
+  * text = "Number of miscarriages and/or abortions"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE35"
+  * linkId = "HIV.D.DE35"
+  * type = #integer
+  * text = "Number of live births"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE36"
+  * linkId = "HIV.D.DE36"
+  * type = #integer
+  * text = "Parity"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE37"
+  * linkId = "HIV.D.DE37"
+  * type = #boolean
+  * text = "Serodiscordant partner"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE38"
+  * linkId = "HIV.D.DE38"
+  * type = #boolean
+  * text = "On ART"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE39"
+  * linkId = "HIV.D.DE39"
+  * type = #date
+  * text = "ART start date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE40"
+  * linkId = "HIV.D.DE40"
+  * type = #boolean
+  * text = "Stopped ART"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE41"
+  * linkId = "HIV.D.DE41"
+  * type = #date
+  * text = "Date ART stopped"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE42"
+  * linkId = "HIV.D.DE42"
+  * type = #boolean
+  * text = "Established on ART"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE43"
+  * linkId = "HIV.D.DE43"
+  * type = #choice
+  * text = "ART start type"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE46"
+  * linkId = "HIV.D.DE46"
+  * type = #date
+  * text = "Date of initiation on ART"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE47"
+  * linkId = "HIV.D.DE47"
+  * type = #integer
+  * text = "Time on ART"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE48"
+  * linkId = "HIV.D.DE48"
+  * type = #date
+  * text = "Date(s) ART restarted"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE49"
+  * linkId = "HIV.D.DE49"
+  * type = #date
+  * text = "ART cohort"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE50"
+  * linkId = "HIV.D.DE50"
+  * type = #boolean
+  * text = "Transfer in for HIV care"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE51"
+  * linkId = "HIV.D.DE51"
+  * type = #date
+  * text = "Date of transfer in"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE52"
+  * linkId = "HIV.D.DE52"
+  * type = #choice
+  * text = "Facility transferred from"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE53"
+  * linkId = "HIV.D.DE53"
+  * type = #date
+  * text = "Date enrolled in HIV care"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE54"
+  * linkId = "HIV.D.DE54"
+  * type = #integer
+  * text = "Age at enrolment"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE55"
+  * linkId = "HIV.D.DE55"
+  * type = #choice
+  * text = "Facility where client first enrolled in HIV care"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE56"
+  * linkId = "HIV.D.DE56"
+  * type = #choice
+  * text = "Antiretroviral (ARV) drugs received prior to enrolment"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE62"
+  * linkId = "HIV.D.DE62"
+  * type = #date
+  * text = "Date ARV drugs received prior to enrolment"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE63"
+  * linkId = "HIV.D.DE63"
+  * type = #choice
+  * text = "Location ARV drugs received prior to enrolment"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE64"
+  * linkId = "HIV.D.DE64"
+  * type = #choice
+  * text = "ARV drug regimen received prior to enrolment"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE65"
+  * linkId = "HIV.D.DE65"
+  * type = #choice
+  * text = "Existing chronic health conditions"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE73"
+  * linkId = "HIV.D.DE73"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE74"
+  * linkId = "HIV.D.DE74"
+  * type = #choice
+  * text = "Original first-line ART regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE75"
+  * linkId = "HIV.D.DE75"
+  * type = #choice
+  * text = "Current ART regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE76"
+  * linkId = "HIV.D.DE76"
+  * type = #date
+  * text = "Current ART regimen start date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE77"
+  * linkId = "HIV.D.DE77"
+  * type = #choice
+  * text = "Preferred first-line ART regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE78"
+  * linkId = "HIV.D.DE78"
+  * type = #choice
+  * text = "Alternative first-line ART regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE79"
+  * linkId = "HIV.D.DE79"
+  * type = #choice
+  * text = "First-line ART regimen under special circumstances"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE80"
+  * linkId = "HIV.D.DE80"
+  * type = #choice
+  * text = "Preferred second-line ART regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE81"
+  * linkId = "HIV.D.DE81"
+  * type = #choice
+  * text = "Alternative second-line ART regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE82"
+  * linkId = "HIV.D.DE82"
+  * type = #choice
+  * text = "Optimal regimen for transition"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE83"
+  * linkId = "HIV.D.DE83"
+  * type = #choice
+  * text = "Current ART regimen (first-, second-, or third-line)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE90"
+  * linkId = "HIV.D.DE90"
+  * type = #choice
+  * text = "ART regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE127"
+  * linkId = "HIV.D.DE127"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE128"
+  * linkId = "HIV.D.DE128"
+  * type = #choice
+  * text = "ART regimen composition"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE146"
+  * linkId = "HIV.D.DE146"
+  * type = #choice
+  * text = "ART regimen drug class"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE186"
+  * linkId = "HIV.D.DE186"
+  * type = #choice
+  * text = "HIV clinical stage"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE191"
+  * linkId = "HIV.D.DE191"
+  * type = #integer
+  * text = "Number of missed doses"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE370"
+  * linkId = "HIV.D.DE370"
+  * type = #choice
+  * text = "Reasons for delayed ART initiation"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE381"
+  * linkId = "HIV.D.DE381"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE382"
+  * linkId = "HIV.D.DE382"
+  * type = #boolean
+  * text = "ART initiated within 7 days of diagnosis"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE383"
+  * linkId = "HIV.D.DE383"
+  * type = #choice
+  * text = "Time to start ART"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE456"
+  * linkId = "HIV.D.DE456"
+  * type = #date
+  * text = "Regimen start date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE537"
+  * linkId = "HIV.D.DE537"
+  * type = #choice
+  * text = "Current medications"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE559"
+  * linkId = "HIV.D.DE559"
+  * type = #string
+  * text = "Other medications (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE560"
+  * linkId = "HIV.D.DE560"
+  * type = #choice
+  * text = "Allergies"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE568"
+  * linkId = "HIV.D.DE568"
+  * type = #string
+  * text = "Other allergies (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE569"
+  * linkId = "HIV.D.DE569"
+  * type = #choice
+  * text = "Family planning method used"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE593"
+  * linkId = "HIV.D.DE593"
+  * type = #choice
+  * text = "Medication status"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE653"
+  * linkId = "HIV.D.DE653"
+  * type = #boolean
+  * text = "AIDS-related death"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE654"
+  * linkId = "HIV.D.DE654"
+  * type = #date
+  * text = "Date of first AIDS diagnosis"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE655"
+  * linkId = "HIV.D.DE655"
+  * type = #integer
+  * text = "Age at final HPV vaccination dose received"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE938"
+  * linkId = "HIV.D.DE938"
+  * type = #boolean
+  * text = "TB disease"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE939"
+  * linkId = "HIV.D.DE939"
+  * type = #choice
+  * text = "TB diagnosis result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE942"
+  * linkId = "HIV.D.DE942"
+  * type = #choice
+  * text = "Method of TB diagnosis"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE945"
+  * linkId = "HIV.D.DE945"
+  * type = #boolean
+  * text = "Presumptive TB"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE946"
+  * linkId = "HIV.D.DE946"
+  * type = #date
+  * text = "Presumptive TB registration date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE947"
+  * linkId = "HIV.D.DE947"
+  * type = #choice
+  * text = "TB treatment history"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE952"
+  * linkId = "HIV.D.DE952"
+  * type = #date
+  * text = "Date of TB diagnosis"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE953"
+  * linkId = "HIV.D.DE953"
+  * type = #boolean
+  * text = "Currently on TB preventive treatment (TPT)"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE954"
+  * linkId = "HIV.D.DE954"
+  * type = #date
+  * text = "TB preventive treatment (TPT) start date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.D.DE955"
+  * linkId = "HIV.D.DE955"
+  * type = #date
+  * text = "TB preventive treatment (TPT) completion date"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.D.DE1000"
   * linkId = "HIV.D.DE1000"
diff --git a/input/fsh/questionnaires/HIV.E1.fsh b/input/fsh/questionnaires/HIV.E1.fsh
index faf20d026c1..f1a51a559ba 100644
--- a/input/fsh/questionnaires/HIV.E1.fsh
+++ b/input/fsh/questionnaires/HIV.E1.fsh
@@ -9,6 +9,543 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.E.DE1"
+  * linkId = "HIV.E.DE1"
+  * type = #string
+  * text = "Pregnant woman's first name"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE2"
+  * linkId = "HIV.E.DE2"
+  * type = #string
+  * text = "Pregnant woman's surname"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE3"
+  * linkId = "HIV.E.DE3"
+  * type = #string
+  * text = "Pregnant woman's unique ID"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE4"
+  * linkId = "HIV.E.DE4"
+  * type = #string
+  * text = "Antenatal care number"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE5"
+  * linkId = "HIV.E.DE5"
+  * type = #integer
+  * text = "Gestational age"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE6"
+  * linkId = "HIV.E.DE6"
+  * type = #choice
+  * text = "Source of gestational age"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE10"
+  * linkId = "HIV.E.DE10"
+  * type = #date
+  * text = "Expected date of delivery (EDD)"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE11"
+  * linkId = "HIV.E.DE11"
+  * type = #integer
+  * text = "Number of pregnancies (gravida)"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE12"
+  * linkId = "HIV.E.DE12"
+  * type = #integer
+  * text = "Number of previous pregnancies"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE13"
+  * linkId = "HIV.E.DE13"
+  * type = #integer
+  * text = "Number of miscarriages and/or abortions"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE14"
+  * linkId = "HIV.E.DE14"
+  * type = #integer
+  * text = "Number of live births"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE15"
+  * linkId = "HIV.E.DE15"
+  * type = #integer
+  * text = "Number of caesarian sections"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE16"
+  * linkId = "HIV.E.DE16"
+  * type = #integer
+  * text = "Number of stillbirths"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE17"
+  * linkId = "HIV.E.DE17"
+  * type = #choice
+  * text = "Past pregnancy complications"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE35"
+  * linkId = "HIV.E.DE35"
+  * type = #string
+  * text = "Other past pregnancy problems (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE36"
+  * linkId = "HIV.E.DE36"
+  * type = #integer
+  * text = "Parity"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE37"
+  * linkId = "HIV.E.DE37"
+  * type = #boolean
+  * text = "Pregnancy in HIV-infected woman"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE38"
+  * linkId = "HIV.E.DE38"
+  * type = #date
+  * text = "Date new pregnancy of HIV-positive woman identified"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE39"
+  * linkId = "HIV.E.DE39"
+  * type = #boolean
+  * text = "ANC contact during pregnancy"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE40"
+  * linkId = "HIV.E.DE40"
+  * type = #date
+  * text = "Date of first ANC visit"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE41"
+  * linkId = "HIV.E.DE41"
+  * type = #choice
+  * text = "Timing of ART initiation"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE45"
+  * linkId = "HIV.E.DE45"
+  * type = #boolean
+  * text = "Maternal use of recommended ART regimen"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE46"
+  * linkId = "HIV.E.DE46"
+  * type = #date
+  * text = "Delivery date"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE47"
+  * linkId = "HIV.E.DE47"
+  * type = #choice
+  * text = "Pregnancy outcome"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE52"
+  * linkId = "HIV.E.DE52"
+  * type = #choice
+  * text = "Delivery mode"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE56"
+  * linkId = "HIV.E.DE56"
+  * type = #string
+  * text = "Indications for caesarian section (C/S)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE57"
+  * linkId = "HIV.E.DE57"
+  * type = #string
+  * text = "Obstetric complications"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE58"
+  * linkId = "HIV.E.DE58"
+  * type = #boolean
+  * text = "Live birth"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE59"
+  * linkId = "HIV.E.DE59"
+  * type = #boolean
+  * text = "Live birth to an HIV-positive woman"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE60"
+  * linkId = "HIV.E.DE60"
+  * type = #integer
+  * text = "Gestational age at birth"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE61"
+  * linkId = "HIV.E.DE61"
+  * type = #boolean
+  * text = "Small for gestational age (SGA)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE62"
+  * linkId = "HIV.E.DE62"
+  * type = #choice
+  * text = "Preterm birth status"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE66"
+  * linkId = "HIV.E.DE66"
+  * type = #date
+  * text = "Maternal ART start date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE67"
+  * linkId = "HIV.E.DE67"
+  * type = #choice
+  * text = "Place of delivery"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE71"
+  * linkId = "HIV.E.DE71"
+  * type = #string
+  * text = "Other (specify)"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE72"
+  * linkId = "HIV.E.DE72"
+  * type = #string
+  * text = "Delivery facility"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE73"
+  * linkId = "HIV.E.DE73"
+  * type = #date
+  * text = "Date of miscarriage or abortion"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE76"
+  * linkId = "HIV.E.DE76"
+  * type = #string
+  * text = "Infant's first name"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE77"
+  * linkId = "HIV.E.DE77"
+  * type = #string
+  * text = "Infant's surname"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE78"
+  * linkId = "HIV.E.DE78"
+  * type = #string
+  * text = "Infant's unique ID"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE79"
+  * linkId = "HIV.E.DE79"
+  * type = #string
+  * text = "Mother's first name"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE80"
+  * linkId = "HIV.E.DE80"
+  * type = #string
+  * text = "Mother's surname"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE81"
+  * linkId = "HIV.E.DE81"
+  * type = #string
+  * text = "Mother's unique ID"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE82"
+  * linkId = "HIV.E.DE82"
+  * type = #string
+  * text = "Caregiver's first name"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE83"
+  * linkId = "HIV.E.DE83"
+  * type = #string
+  * text = "Caregiver's surname"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE84"
+  * linkId = "HIV.E.DE84"
+  * type = #string
+  * text = "Caregiver's unique identifier"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE85"
+  * linkId = "HIV.E.DE85"
+  * type = #dateTime
+  * text = "ANC contact date"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE86"
+  * linkId = "HIV.E.DE86"
+  * type = #boolean
+  * text = "Referral"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE87"
+  * linkId = "HIV.E.DE87"
+  * type = #date
+  * text = "Infant date of birth"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE88"
+  * linkId = "HIV.E.DE88"
+  * type = #boolean
+  * text = "Date of birth of infant unknown"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE89"
+  * linkId = "HIV.E.DE89"
+  * type = #integer
+  * text = "Estimated age of infant"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE90"
+  * linkId = "HIV.E.DE90"
+  * type = #integer
+  * text = "Age of infant"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE91"
+  * linkId = "HIV.E.DE91"
+  * type = #choice
+  * text = "Gender of infant"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE113"
+  * linkId = "HIV.E.DE113"
+  * type = #boolean
+  * text = "Key population member"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE114"
+  * linkId = "HIV.E.DE114"
+  * type = #choice
+  * text = "Key population member type"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE134"
+  * linkId = "HIV.E.DE134"
+  * type = #boolean
+  * text = "Taking iron and folic acid (IFA) tablets"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE135"
+  * linkId = "HIV.E.DE135"
+  * type = #integer
+  * text = "Amount of iron prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE136"
+  * linkId = "HIV.E.DE136"
+  * type = #choice
+  * text = "Type of iron supplement dosage provided"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE139"
+  * linkId = "HIV.E.DE139"
+  * type = #integer
+  * text = "Amount of daily dose of folic acid prescribed"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE141"
+  * linkId = "HIV.E.DE141"
+  * type = #choice
+  * text = "Maternal HIV status"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE145"
+  * linkId = "HIV.E.DE145"
+  * type = #choice
+  * text = "Maternal HIV status at first ANC visit"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE155"
+  * linkId = "HIV.E.DE155"
+  * type = #choice
+  * text = "Signs of substantial risk of HIV infection"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE160"
+  * linkId = "HIV.E.DE160"
+  * type = #boolean
+  * text = "Serodiscordant partner"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE161"
+  * linkId = "HIV.E.DE161"
+  * type = #date
+  * text = "Date woman received counselling for CPT"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE162"
+  * linkId = "HIV.E.DE162"
+  * type = #date
+  * text = "Date woman received counselling for TPT"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE173"
+  * linkId = "HIV.E.DE173"
+  * type = #choice
+  * text = "Maternal and child health service visit"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE177"
+  * linkId = "HIV.E.DE177"
+  * type = #integer
+  * text = "Weeks postpartum"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.E.DE243"
   * linkId = "HIV.E.DE243"
diff --git a/input/fsh/questionnaires/HIV.E4.fsh b/input/fsh/questionnaires/HIV.E4.fsh
index 54d9c3710e2..97e73be436b 100644
--- a/input/fsh/questionnaires/HIV.E4.fsh
+++ b/input/fsh/questionnaires/HIV.E4.fsh
@@ -9,6 +9,47 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.E.DE101"
+  * linkId = "HIV.E.DE101"
+  * type = #boolean
+  * text = "Mother HIV test conducted"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE102"
+  * linkId = "HIV.E.DE102"
+  * type = #boolean
+  * text = "Mother HIV test ordered"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE103"
+  * linkId = "HIV.E.DE103"
+  * type = #dateTime
+  * text = "Mother HIV test date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE104"
+  * linkId = "HIV.E.DE104"
+  * type = #choice
+  * text = "Maternal HIV test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE168"
+  * linkId = "HIV.E.DE168"
+  * type = #choice
+  * text = "HIV test type"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.E.DE194"
   * linkId = "HIV.E.DE194"
diff --git a/input/fsh/questionnaires/HIV.F12.fsh b/input/fsh/questionnaires/HIV.F12.fsh
index d7e7e2c70f1..4a4bba086af 100644
--- a/input/fsh/questionnaires/HIV.F12.fsh
+++ b/input/fsh/questionnaires/HIV.F12.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.E.DE163"
   * linkId = "HIV.E.DE163"
diff --git a/input/fsh/questionnaires/HIV.F16.fsh b/input/fsh/questionnaires/HIV.F16.fsh
index 2cfd0955e80..22bd818e4ee 100644
--- a/input/fsh/questionnaires/HIV.F16.fsh
+++ b/input/fsh/questionnaires/HIV.F16.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.E.DE229"
   * linkId = "HIV.E.DE229"
diff --git a/input/fsh/questionnaires/HIV.F2.fsh b/input/fsh/questionnaires/HIV.F2.fsh
index 449cfd67522..b15013593f0 100644
--- a/input/fsh/questionnaires/HIV.F2.fsh
+++ b/input/fsh/questionnaires/HIV.F2.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.E.DE95"
   * linkId = "HIV.E.DE95"
diff --git a/input/fsh/questionnaires/HIV.F20.fsh b/input/fsh/questionnaires/HIV.F20.fsh
index c2cd244f7d0..a0151c92e92 100644
--- a/input/fsh/questionnaires/HIV.F20.fsh
+++ b/input/fsh/questionnaires/HIV.F20.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.E.DE230"
   * linkId = "HIV.E.DE230"
diff --git a/input/fsh/questionnaires/HIV.F3.fsh b/input/fsh/questionnaires/HIV.F3.fsh
index e00a54da696..90c99e0c2da 100644
--- a/input/fsh/questionnaires/HIV.F3.fsh
+++ b/input/fsh/questionnaires/HIV.F3.fsh
@@ -9,6 +9,135 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.E.DE97"
+  * linkId = "HIV.E.DE97"
+  * type = #integer
+  * text = "Birth weight"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE98"
+  * linkId = "HIV.E.DE98"
+  * type = #boolean
+  * text = "Low birth weight"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE99"
+  * linkId = "HIV.E.DE99"
+  * type = #integer
+  * text = "Length of infant"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE100"
+  * linkId = "HIV.E.DE100"
+  * type = #integer
+  * text = "Head circumference"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE119"
+  * linkId = "HIV.E.DE119"
+  * type = #boolean
+  * text = "Postpartum family planning counselling conducted"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE121"
+  * linkId = "HIV.E.DE121"
+  * type = #boolean
+  * text = "ARV adherence counselling"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE122"
+  * linkId = "HIV.E.DE122"
+  * type = #boolean
+  * text = "Infant feeding counselling provided"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE123"
+  * linkId = "HIV.E.DE123"
+  * type = #date
+  * text = "Date infant feeding counselling provided"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE124"
+  * linkId = "HIV.E.DE124"
+  * type = #boolean
+  * text = "Malaria prevention counselling conducted"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE125"
+  * linkId = "HIV.E.DE125"
+  * type = #boolean
+  * text = "Insecticide treated bednet (ITN) provided or referred"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE126"
+  * linkId = "HIV.E.DE126"
+  * type = #boolean
+  * text = "Maternal syphilis treatment"
+  * required = true
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE127"
+  * linkId = "HIV.E.DE127"
+  * type = #choice
+  * text = "Infant feeding practice"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE131"
+  * linkId = "HIV.E.DE131"
+  * type = #date
+  * text = "Infant feeding practice recorded date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE132"
+  * linkId = "HIV.E.DE132"
+  * type = #boolean
+  * text = "Stopped breastfeeding"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE133"
+  * linkId = "HIV.E.DE133"
+  * type = #date
+  * text = "Date stopped breastfeeding"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE140"
+  * linkId = "HIV.E.DE140"
+  * type = #date
+  * text = "Date infant ARV prophylaxis dispensed (or started)"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.E.DE178"
   * linkId = "HIV.E.DE178"
diff --git a/input/fsh/questionnaires/HIV.F6.fsh b/input/fsh/questionnaires/HIV.F6.fsh
index 5211375c016..1c9fe217c8b 100644
--- a/input/fsh/questionnaires/HIV.F6.fsh
+++ b/input/fsh/questionnaires/HIV.F6.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.E.DE108"
   * linkId = "HIV.E.DE108"
diff --git a/input/fsh/questionnaires/HIV.F8.fsh b/input/fsh/questionnaires/HIV.F8.fsh
index 796a63576df..06320305a8a 100644
--- a/input/fsh/questionnaires/HIV.F8.fsh
+++ b/input/fsh/questionnaires/HIV.F8.fsh
@@ -9,6 +9,47 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.E.DE120"
+  * linkId = "HIV.E.DE120"
+  * type = #integer
+  * text = "Age of infant on HIV test date"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE180"
+  * linkId = "HIV.E.DE180"
+  * type = #choice
+  * text = "EID sample number"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE183"
+  * linkId = "HIV.E.DE183"
+  * type = #choice
+  * text = "EID test number"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE186"
+  * linkId = "HIV.E.DE186"
+  * type = #choice
+  * text = "EID test number 1 test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.E.DE190"
+  * linkId = "HIV.E.DE190"
+  * type = #choice
+  * text = "EID test number 2 test result"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.E.DE224"
   * linkId = "HIV.E.DE224"
diff --git a/input/fsh/questionnaires/HIV.H.fsh b/input/fsh/questionnaires/HIV.H.fsh
index 5a902a851d9..1408df9311c 100644
--- a/input/fsh/questionnaires/HIV.H.fsh
+++ b/input/fsh/questionnaires/HIV.H.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.E.DE74"
   * linkId = "HIV.E.DE74"
diff --git a/input/fsh/questionnaires/HIV.H1.fsh b/input/fsh/questionnaires/HIV.H1.fsh
index 735d99978b7..a203a273d6c 100644
--- a/input/fsh/questionnaires/HIV.H1.fsh
+++ b/input/fsh/questionnaires/HIV.H1.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.H.DE1"
   * linkId = "HIV.H.DE1"
diff --git a/input/fsh/questionnaires/HIV.H2.fsh b/input/fsh/questionnaires/HIV.H2.fsh
index 6e55468c028..a2112d6a8b6 100644
--- a/input/fsh/questionnaires/HIV.H2.fsh
+++ b/input/fsh/questionnaires/HIV.H2.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.H.DE10"
   * linkId = "HIV.H.DE10"
diff --git a/input/fsh/questionnaires/HIV.H3.fsh b/input/fsh/questionnaires/HIV.H3.fsh
index 35cbef65aa6..8498dd87b11 100644
--- a/input/fsh/questionnaires/HIV.H3.fsh
+++ b/input/fsh/questionnaires/HIV.H3.fsh
@@ -9,6 +9,39 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
+* item[+]
+  * id = "HIV.H.DE23"
+  * linkId = "HIV.H.DE23"
+  * type = #choice
+  * text = "Outcome from outreach attempt"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.H.DE30"
+  * linkId = "HIV.H.DE30"
+  * type = #boolean
+  * text = "Moved from catchment area"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.H.DE31"
+  * linkId = "HIV.H.DE31"
+  * type = #date
+  * text = "Date client moved from catchment area"
+  * required = false
+  * repeats = false
+  * readOnly = false
+* item[+]
+  * id = "HIV.H.DE32"
+  * linkId = "HIV.H.DE32"
+  * type = #string
+  * text = "New catchment area"
+  * required = false
+  * repeats = false
+  * readOnly = false
 * item[+]
   * id = "HIV.H.DE38"
   * linkId = "HIV.H.DE38"
diff --git a/input/fsh/questionnaires/HIV.I1.fsh b/input/fsh/questionnaires/HIV.I1.fsh
index 04926fc5633..7145b0edcaa 100644
--- a/input/fsh/questionnaires/HIV.I1.fsh
+++ b/input/fsh/questionnaires/HIV.I1.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.I.DE1"
   * linkId = "HIV.I.DE1"
diff --git a/input/fsh/questionnaires/HIV.I6.fsh b/input/fsh/questionnaires/HIV.I6.fsh
index ece916f5846..2341b03949a 100644
--- a/input/fsh/questionnaires/HIV.I6.fsh
+++ b/input/fsh/questionnaires/HIV.I6.fsh
@@ -9,6 +9,7 @@ Usage: #definition
 * language = #en
 * status = #draft
 * experimental = true
+
 * item[+]
   * id = "HIV.I.DE2"
   * linkId = "HIV.I.DE2"