diff --git a/api/src/main/resources/metadata/concepts_and_drugs/Concept.xml b/api/src/main/resources/metadata/concepts_and_drugs/Concept.xml
index 6ebdf93d..bdcf6629 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/Concept.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/Concept.xml
@@ -4893,5 +4893,7 @@
     <concept  concept_id="198995"  retired="0" datatype_id="4"  class_id="5"  is_set="0"  creator="1"  date_created="2024-10-23 15:17:15"  version=""  changed_by="1"  date_changed="2024-10-23 15:17:15"  uuid="bc37c7d7-6b2a-467a-a311-d0361bcd886c"/>
     <concept  concept_id="199028"  retired="0" datatype_id="3"  class_id="5"  is_set="0"  creator="1"  date_created="2024-10-26 11:45:27"  version=""  changed_by="1"  date_changed="2024-10-26 11:45:27" uuid="cd8e78ac-c57b-4266-8ba9-a110d6647f79"/>
     <concept  concept_id="199029"  retired="0" datatype_id="4"  class_id="5"  is_set="0"  creator="1"  date_created="2024-11-12 13:37:28"  version=""  changed_by="1"  date_changed="2024-11-12 13:37:28" uuid="cac9f005-226e-4d6c-8e3e-16119fcc8f6b"/>
+    <concept  concept_id="199030"  retired="0" datatype_id="4"  class_id="5"  is_set="0"  creator="1"  date_created="2024-11-13 11:16:57"  version=""  changed_by="1"  date_changed="2024-11-13 11:16:57"  uuid="973a7e7c-2e1d-4431-813f-ce03d5afda62"/>
+    <concept  concept_id="199031"  retired="0" datatype_id="4"  class_id="5"  is_set="0"  creator="1"  date_created="2024-11-13 11:18:29"  version=""  changed_by="1"  date_changed="2024-11-13 11:18:29"  uuid="7307349d-c333-4dee-a271-3a11cc656815"/>
 
 </dataset>
\ No newline at end of file
diff --git a/api/src/main/resources/metadata/concepts_and_drugs/Concept_Answer.xml b/api/src/main/resources/metadata/concepts_and_drugs/Concept_Answer.xml
index 6f277b4a..533c3328 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/Concept_Answer.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/Concept_Answer.xml
@@ -3571,6 +3571,7 @@
     <concept_answer  concept_answer_id="7375365"  concept_id="160855"  answer_concept="198949" creator="1"  date_created="2024-08-06 09:16:29"  sort_weight="4927"  uuid="c4082cb4-f3fd-4baa-bb27-8a8c9894f8a5"/>
     <concept_answer  concept_answer_id="7375366"  concept_id="160855"  answer_concept="198950" creator="1"  date_created="2024-08-06 09:16:29"  sort_weight="4928"  uuid="5cf58068-312e-47a6-a359-c72a7a628c8d"/>
     <concept_answer  concept_answer_id="7375450"  concept_id="160288"  answer_concept="199029" creator="1"  date_created="2024-11-12 13:40:05"  sort_weight="24"  uuid="558db38f-9a2d-490c-970a-4db73b643c1b"/>
+    <concept_answer  concept_answer_id="7375451"  concept_id="198900"  answer_concept="199031" creator="1"  date_created="2024-11-13 11:22:24"  sort_weight="7"  uuid="63f7dddb-e7d5-422d-9e23-21306f99e30f"/>
 
 
 </dataset>
\ No newline at end of file
diff --git a/api/src/main/resources/metadata/concepts_and_drugs/Concept_Description.xml b/api/src/main/resources/metadata/concepts_and_drugs/Concept_Description.xml
index 1d467356..dfa7b3dc 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/Concept_Description.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/Concept_Description.xml
@@ -660,5 +660,7 @@
     <concept_description  concept_description_id="18739"  concept_id="168695"  description="Entry point for cancer patients"    locale="en"  creator="1"  date_created="2023-04-04 16:57:28"   uuid="fc24eb63-d463-4bf1-a4c3-22e31e3bfbd2"/>
     <concept_description  concept_description_id="18740"  concept_id="168697"  description="Is patient Currently Menstruating"  locale="en"  creator="1"  date_created="2023-04-04 17:00:41"   uuid="13e56678-0ba8-4b60-86e6-a3dfa47c4489"/>
     <concept_description  concept_description_id="18746"  concept_id="199029"  description="CACX Screening/Treatment"  locale="en"  creator="1"  date_created="2024-11-12 13:37:28"  uuid="26cc3d04-df2c-4d60-ad2a-f311ba56a24b"/>
+    <concept_description  concept_description_id="18747"  concept_id="199030"  description="Known Diabetic and controlled on lifestyle modification"  locale="en"  creator="1"  date_created="2024-11-13 11:16:57" uuid="c4a46bdf-6002-4995-bc84-8e88e1000203"/>
+    <concept_description  concept_description_id="18748"  concept_id="199031"  description="Known Diabetic and controlled on medication and lifestyle modification"  locale="en"  creator="1"  date_created="2024-11-13 11:18:29" uuid="ba4130bb-0567-43f8-8114-a6d0570e31d1"/>
 
 </dataset>
\ No newline at end of file
diff --git a/api/src/main/resources/metadata/concepts_and_drugs/Concept_Name.xml b/api/src/main/resources/metadata/concepts_and_drugs/Concept_Name.xml
index 9f63989a..60fac96d 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/Concept_Name.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/Concept_Name.xml
@@ -6805,5 +6805,7 @@
     <concept_name  concept_name_id="198957"  concept_id="198949"  name="Quarterly"  locale="en"  locale_preferred="1"  creator="1"  date_created="2024-08-06 09:14:05"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="4927e2f2-610f-4920-9167-21c3d0581ab8"/>
     <concept_name  concept_name_id="198958"  concept_id="198950"  name="Annually"   locale="en"  locale_preferred="1"  creator="1"  date_created="2024-08-06 09:14:44"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="beef23bf-116c-4134-ba98-0bf1bddcce0d"/>
     <concept_name  concept_name_id="199038"  concept_id="199029"  name="CACX Screening/Treatment"  locale="en"  locale_preferred="1"  creator="1"  date_created="2024-11-12 13:37:28"  concept_name_type="FULLY_SPECIFIED"  voided="0" uuid="a35a0840-ecdf-44b5-a6ea-97f0855ba496"/>
+    <concept_name  concept_name_id="199039"  concept_id="199030"  name="Known Diabetic and controlled on lifestyle modification"  locale="en"  locale_preferred="1"  creator="1"  date_created="2024-11-13 11:16:57"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="78f2e1da-15bc-4872-b3d3-7a2522e5c6c7"/>
+    <concept_name  concept_name_id="199040"  concept_id="199031"  name="Known Diabetic and controlled on medication and lifestyle modification"  locale="en"  locale_preferred="1"  creator="1"  date_created="2024-11-13 11:18:29"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="4ced5e42-b1ed-44c7-ae22-fbc3d6492db8"/>
 
 </dataset>
\ No newline at end of file
diff --git a/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json b/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json
index 8ce54d7c..2fca90f5 100644
--- a/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json
+++ b/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json
@@ -312,40 +312,40 @@
                 "concept": "c8f00db3-abb6-46a2-89a4-25acf95be863",
                 "answers": [
                   {
-                    "concept": "6fd77b25-dc32-4c42-b278-d10034d0238a",
-                    "label": "Hypertensive patient referred for further management"
-                  },
-                  {
-                    "concept": "4c71f560-3d28-4ed5-9a81-e79e9706960d",
-                    "label": "Known Hypertensive and Controlled and on lifestyle modification"
+                    "concept": "5f0b55b8-d4ec-46e7-a052-7f1176a91077",
+                    "label": "1 - Normal Blood pressure"
                   },
                   {
-                    "concept": "f569d1a9-de58-4c80-8f97-807cc6129a6b",
-                    "label": "Known Hypertensive and Controlled and on lifestyle modification and Medication"
+                    "concept": "f23000f4-f6bf-4438-bcb8-2b741612238c",
+                    "label": "2 - Newly Diagnosed and on lifestyle modification"
                   },
                   {
-                    "concept": "00a80828-26be-463c-8090-9c6d1c11a885",
-                    "label": "Known Hypertensive but not on Treatment"
+                    "concept": "205b0a6e-7367-46d0-9d2c-ee5a64fbc756",
+                    "label": "3 - Newly Diagnosed and on lifestyle modification and Medication"
                   },
                   {
                     "concept": "5b839510-a3d0-41fa-bbeb-e446d98140d8",
-                    "label": "Known Hypertensive, not controlled and on lifestyle modification"
+                    "label": "4 - Known Hypertensive, not controlled and on lifestyle modification"
                   },
                   {
                     "concept": "0e43e79e-92ba-42dd-b436-564e1bc1d856",
-                    "label": "Known Hypertensive, not controlled and on lifestyle modification and Medication"
+                    "label": "5 - Known Hypertensive, not controlled and on lifestyle modification and Medication"
                   },
                   {
-                    "concept": "f23000f4-f6bf-4438-bcb8-2b741612238c",
-                    "label": "Newly Diagnosed and on lifestyle modification"
+                    "concept": "4c71f560-3d28-4ed5-9a81-e79e9706960d",
+                    "label": "6 - Known Hypertensive and Controlled and on lifestyle modification"
                   },
                   {
-                    "concept": "205b0a6e-7367-46d0-9d2c-ee5a64fbc756",
-                    "label": "Newly Diagnosed and on lifestyle modification and Medication"
+                    "concept": "f569d1a9-de58-4c80-8f97-807cc6129a6b",
+                    "label": "7 - Known Hypertensive and Controlled and on lifestyle modification and Medication"
                   },
                   {
-                    "concept": "5f0b55b8-d4ec-46e7-a052-7f1176a91077",
-                    "label": "Normal Blood pressure"
+                    "concept": "00a80828-26be-463c-8090-9c6d1c11a885",
+                    "label": "8 - Known Hypertensive but not on Treatment"
+                  },
+                  {
+                    "concept": "6fd77b25-dc32-4c42-b278-d10034d0238a",
+                    "label": "9 - Hypertensive patient referred for further management"
                   }
                 ]
               },
@@ -360,29 +360,45 @@
                 "rendering": "select",
                 "concept": "126aecd6-c4de-4b1f-bfa2-8f68380f9329",
                 "answers": [
+                  {
+                    "concept": "5bc3446f-c473-4f6c-ba58-a168ea79f096",
+                    "label": "1 - No clinical Symptoms and Signs"
+                  },
                   {
                     "concept": "fd36c202-06ad-4e9b-95e7-d3e02d34c936",
-                    "label": "Normal blood sugar"
+                    "label": "2 - Normal blood sugar"
                   },
                   {
-                    "concept": "5bc3446f-c473-4f6c-ba58-a168ea79f096",
-                    "label": "No clinical Symptoms and Signs"
+                    "concept": "f23000f4-f6bf-4438-bcb8-2b741612238c",
+                    "label": "3 - Newly Diagnosed and on lifestyle modification"
                   },
                   {
-                    "concept": "8473a4cb-5431-4775-83b2-6f0c8086ecbe",
-                    "label": "Known Diabetic but not on Treatment"
+                    "concept": "205b0a6e-7367-46d0-9d2c-ee5a64fbc756",
+                    "label": "4 - Newly Diagnosed and on lifestyle modification and Medication"
+                  },
+                  {
+                    "concept": "844dec77-9c0c-4bb1-ab23-ccc083c9c97a",
+                    "label": "5 - Known Diabetic and not controlled on lifestyle modification"
                   },
                   {
                     "concept": "c1ede22a-fe95-402e-b2f2-18b1709f0414",
-                    "label": "Known Diabetic and not controlled on medication and lifestyle modification"
+                    "label": "6 - Known Diabetic and not controlled on medication and lifestyle modification"
                   },
                   {
-                    "concept": "844dec77-9c0c-4bb1-ab23-ccc083c9c97a",
-                    "label": "Known Diabetic and not controlled on lifestyle modification"
+                    "concept": "973a7e7c-2e1d-4431-813f-ce03d5afda62",
+                    "label": "7 - Known Diabetic and controlled on lifestyle modification"
+                  },
+                  {
+                    "concept": "7307349d-c333-4dee-a271-3a11cc656815",
+                    "label": "8 - Known Diabetic and controlled on medication and lifestyle modification"
+                  },
+                  {
+                    "concept": "8473a4cb-5431-4775-83b2-6f0c8086ecbe",
+                    "label": "9 - Known Diabetic but not on Treatment"
                   },
                   {
                     "concept": "8047b4be-11cb-47a6-a98b-2e7777ea7477",
-                    "label": "Diabetic patient referred for further management"
+                    "label": "10 - Diabetic patient referred for further management"
                   }
                 ]
               },
@@ -398,48 +414,48 @@
                 "concept": "6649a671-32ea-45b7-adc5-bda1cff7febd",
                 "answers": [
                   {
-                    "concept": "2e3760ca-aea9-4958-a2c6-6ad32dc79445",
-                    "label": "Has signs and symptoms with high suicide Risk on Medication only"
-                  },
-                  {
-                    "concept": "8faa9bb9-9065-44bc-b426-ef0336ff4c94",
-                    "label": "Has signs and symptoms with high suicide Risk on Psychotherapy and Medication"
+                    "concept": "5bc3446f-c473-4f6c-ba58-a168ea79f096",
+                    "label": "1 - No clinical Symptoms and Signs"
                   },
                   {
                     "concept": "9a3ecb59-6cfd-4c9a-b63b-1f4bda0a3a47",
-                    "label": "Has signs and symptoms with Low/moderate suicide Risk"
+                    "label": "2 - Has signs and symptoms with Low/moderate suicide Risk"
                   },
                   {
-                    "concept": "678ae5a3-8b79-4d2a-ac95-32128cf311f1",
-                    "label": "Known mental illness NEITHER on Psychotherapy NOR Medication"
+                    "concept": "2e3760ca-aea9-4958-a2c6-6ad32dc79445",
+                    "label": "3 - Has signs and symptoms with high suicide Risk on Medication only"
                   },
                   {
-                    "concept": "d3182660-b86b-4df1-950b-d9903587d88b",
-                    "label": "Known mental illness on Medication only"
+                    "concept": "8faa9bb9-9065-44bc-b426-ef0336ff4c94",
+                    "label": "4 - Has signs and symptoms with high suicide Risk on Psychotherapy and Medication"
                   },
                   {
-                    "concept": "62d257a7-9dea-4240-a7de-ec1f800da668",
-                    "label": "Known mental illness on Psychotherapy and Medication"
+                    "concept": "0888ffe4-47d1-4f72-8d98-df2ff30a6f79",
+                    "label": "5 - Known mental illness on Psychotherapy only"
                   },
                   {
-                    "concept": "0888ffe4-47d1-4f72-8d98-df2ff30a6f79",
-                    "label": "Known mental illness on Psychotherapy only"
+                    "concept": "d3182660-b86b-4df1-950b-d9903587d88b",
+                    "label": "6 - Known mental illness on Medication only"
                   },
                   {
-                    "concept": "5bc3446f-c473-4f6c-ba58-a168ea79f096",
-                    "label": "No clinical Symptoms and Signs"
+                    "concept": "62d257a7-9dea-4240-a7de-ec1f800da668",
+                    "label": "7 - Known mental illness on Psychotherapy and Medication"
                   },
                   {
-                    "concept": "dca26f78-30ab-102d-86b0-7a5022ba4115",
-                    "label": "NOT ELIGIBLE"
+                    "concept": "678ae5a3-8b79-4d2a-ac95-32128cf311f1",
+                    "label": "8 - Known mental illness NEITHER on Psychotherapy NOR Medication"
                   },
                   {
                     "concept": "21641587-3417-4f0a-b77a-bb7c07126b5b",
-                    "label": "Recovered"
+                    "label": "9 - Recovered"
                   },
                   {
                     "concept": "7b246acf-d518-4b51-828c-d69593f3d66b",
-                    "label": "Referred Out"
+                    "label": "10 - Referred Out"
+                  },
+                  {
+                    "concept": "dca26f78-30ab-102d-86b0-7a5022ba4115",
+                    "label": "11 - NOT ELIGIBLE"
                   }
                 ]
               },
@@ -455,36 +471,36 @@
                 "concept": "10eb8116-0602-41e4-8e62-6325440dffb2",
                 "answers": [
                   {
-                    "concept": "3a67585e-e401-4320-a31e-0d7c97818e61",
-                    "label": "Has Signs and Symptoms on Brief Intervention"
+                    "concept": "5bc3446f-c473-4f6c-ba58-a168ea79f096",
+                    "label": "1 - No clinical Symptoms and Signs"
                   },
                   {
-                    "concept": "9b0fdd9e-0607-441b-80cd-de7ef710376c",
-                    "label": "Has Signs and Symptoms on Brief Intervention/clinical management"
+                    "concept": "3a67585e-e401-4320-a31e-0d7c97818e61",
+                    "label": "2 - Has Signs and Symptoms on Brief Intervention"
                   },
                   {
-                    "concept": "fb681708-d19a-4a92-91c4-df29a50cbb35",
-                    "label": "Known Alcohol or Substance use disorder NEITHER on Brief Intervention NOR clinical management"
+                    "concept": "9b0fdd9e-0607-441b-80cd-de7ef710376c",
+                    "label": "3 - Has Signs and Symptoms on Brief Intervention/clinical management"
                   },
                   {
                     "concept": "f8c953db-113d-4b11-b4e6-83ad7516869d",
-                    "label": "Known Alcohol or Substance use disorder on Brief Intervention and/or clinical management"
+                    "label": "4 - Known Alcohol or Substance use disorder on Brief Intervention and/or clinical management"
                   },
                   {
-                    "concept": "5bc3446f-c473-4f6c-ba58-a168ea79f096",
-                    "label": "No clinical Symptoms and Signs"
-                  },
-                  {
-                    "concept": "dca26f78-30ab-102d-86b0-7a5022ba4115",
-                    "label": "NOT ELIGIBLE"
+                    "concept": "fb681708-d19a-4a92-91c4-df29a50cbb35",
+                    "label": "5 - Known Alcohol or Substance use disorder NEITHER on Brief Intervention NOR clinical management"
                   },
                   {
                     "concept": "21641587-3417-4f0a-b77a-bb7c07126b5b",
-                    "label": "Recovered"
+                    "label": "6 - Recovered"
                   },
                   {
                     "concept": "7b246acf-d518-4b51-828c-d69593f3d66b",
-                    "label": "Referred Out"
+                    "label": "7 - Referred Out"
+                  },
+                  {
+                    "concept": "dca26f78-30ab-102d-86b0-7a5022ba4115",
+                    "label": "8 - NOT ELIGIBLE"
                   }
                 ]
               },