diff --git a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept.xml b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept.xml
index 2719e4e06..1813b6c3e 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept.xml
@@ -688,4 +688,51 @@
         <concept  concept_id="199619"  retired="0"  datatype_id="4"  class_id="22"  is_set="0"  creator="1"  date_created="2025-06-24 14:30:45"  changed_by="1"  date_changed="2025-06-24 14:30:45" uuid="51de6de9-1da5-4c9b-b9d8-1b02bbc3900b"/>
 
 
+        <concept  concept_id="199620"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:48:18"  changed_by="1"  date_changed="2025-06-30 11:48:18"  uuid="7521c6a6-fa5b-4ad3-9561-352e150388bf"/>
+        <concept  concept_id="199621"  retired="0"  datatype_id="2"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:49:18"  changed_by="1"  date_changed="2025-06-30 11:49:18"  uuid="f629b7f1-de33-4287-a80c-f00af8754e10"/>
+        <concept  concept_id="199622"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:49:48"  changed_by="1"  date_changed="2025-06-30 11:49:48"  uuid="4662ba12-e995-4b5c-8e19-19365e29c173"/>
+        <concept  concept_id="199623"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:50:18"  changed_by="1"  date_changed="2025-06-30 11:50:18"  uuid="b5d6f7f3-b7c0-4d2d-af17-31a9c355f4c2"/>
+        <concept  concept_id="199624"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:51:15"  changed_by="1"  date_changed="2025-06-30 11:51:15"  uuid="807128ee-59cc-4a53-b387-2bbad7d939a2"/>
+        <concept  concept_id="199625"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:51:37"  changed_by="1"  date_changed="2025-06-30 11:51:37"  uuid="5c25542d-1887-4706-8d02-749d859af63a"/>
+        <concept  concept_id="199626"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:53:45"  changed_by="1"  date_changed="2025-06-30 11:53:45"  uuid="f3844204-c7d9-448c-a27f-1f4a8bd423d4"/>
+        <concept  concept_id="199627"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:54:14"  changed_by="1"  date_changed="2025-06-30 11:54:14"  uuid="e5640aa7-3994-416a-9965-9bed2a63b3fc"/>
+        <concept  concept_id="199628"  retired="0"  datatype_id="2"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:54:33"  changed_by="1"  date_changed="2025-06-30 11:54:33"  uuid="51df656d-a2a6-43dc-a834-abc05521511b"/>
+        <concept  concept_id="199629"  retired="0"  datatype_id="3"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:58:07"  changed_by="1"  date_changed="2025-06-30 11:58:07"  uuid="4d89d682-9b5d-4f5b-872b-a0a0f7276009"/>
+        <concept  concept_id="199630"  retired="0"  datatype_id="1"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:59:02"  changed_by="1"  date_changed="2025-06-30 11:59:02"  uuid="e421ccd7-6816-42a9-bd0e-b2ab8389376e"/>
+        <concept  concept_id="199631"  retired="0"  datatype_id="1"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:59:30"  changed_by="1"  date_changed="2025-06-30 11:59:30"  uuid="6378aa4a-39b0-4ec6-bb8a-75299171bdc2"/>
+        <concept  concept_id="199632"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 11:59:55"  changed_by="1"  date_changed="2025-06-30 11:59:55"  uuid="5b08f9d2-dd78-42fd-bcf5-ee265af2a3cf"/>
+        <concept  concept_id="199633"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:00:22"  changed_by="1"  date_changed="2025-06-30 12:00:22"  uuid="a5fbc605-0847-437e-9885-ba79229fedf4"/>
+        <concept  concept_id="199634"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:00:42"  changed_by="1"  date_changed="2025-06-30 12:00:42"  uuid="2b0f5c02-d1e8-4f3e-936b-1d8d43132515"/>
+        <concept  concept_id="199635"  retired="0"  datatype_id="2"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:02:00"  changed_by="1"  date_changed="2025-06-30 12:02:00"  uuid="cd101fa1-0c62-4bc6-bb12-0c2cc24ac8ca"/>
+        <concept  concept_id="199636"  retired="0"  datatype_id="2"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:03:26"  changed_by="1"  date_changed="2025-06-30 12:03:26"  uuid="7faf2044-2590-470b-b257-8ca96829c084"/>
+        <concept  concept_id="199637"  retired="0"  datatype_id="6"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:03:44"  changed_by="1"  date_changed="2025-06-30 12:03:44"  uuid="d7f97396-a1c2-46d5-9ef0-41f9f115136d"/>
+        <concept  concept_id="199638"  retired="0"  datatype_id="2"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:07:29"  changed_by="1"  date_changed="2025-06-30 12:07:29"  uuid="d217f1ed-997d-42b6-b928-a1a9d4d756f2"/>
+        <concept  concept_id="199639"  retired="0"  datatype_id="3"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:07:55"  changed_by="1"  date_changed="2025-06-30 12:07:55"  uuid="77dfdf96-46e2-4410-8fb3-7d4797cf96a3"/>
+        <concept  concept_id="199640"  retired="0"  datatype_id="1"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:08:30"  changed_by="1"  date_changed="2025-06-30 12:08:30"  uuid="4be9eb4c-ee9a-4652-973e-3f6ac97ffcb2"/>
+        <concept  concept_id="199641"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:10:49"  changed_by="1"  date_changed="2025-06-30 12:10:49"  uuid="d4973cc1-4036-40d0-84ec-7f6958542d53"/>
+        <concept  concept_id="199642"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:11:16"  changed_by="1"  date_changed="2025-06-30 12:11:16"  uuid="7d7205cb-1128-4f1f-9dcb-47e684bdf7e6"/>
+        <concept  concept_id="199643"  retired="0"  datatype_id="2"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:12:50"  changed_by="1"  date_changed="2025-06-30 12:12:50"  uuid="8f00bb8d-e262-43a3-bb71-42f4dba6e37f"/>
+        <concept  concept_id="199644"  retired="0"  datatype_id="3"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:15:04"  changed_by="1"  date_changed="2025-06-30 12:15:04"  uuid="ab7aec05-632b-4e0f-97c3-5c30e6747acc"/>
+        <concept  concept_id="199645"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:16:07"  changed_by="1"  date_changed="2025-06-30 12:16:07"  uuid="2b5c68ca-788f-435c-8ea3-87f0a7c02086"/>
+        <concept  concept_id="199646"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:16:18"  changed_by="1"  date_changed="2025-06-30 12:16:18"  uuid="ca263513-7def-4a66-a1d1-dad80d19d913"/>
+        <concept  concept_id="199647"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:16:42"  changed_by="1"  date_changed="2025-06-30 12:16:42"  uuid="353cb734-d5eb-45f2-8d47-365b84cb0a10"/>
+        <concept  concept_id="199648"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:17:47"  changed_by="1"  date_changed="2025-06-30 12:17:47"  uuid="cc44fcbb-da36-4d67-9e7d-fa9538abfce3"/>
+        <concept  concept_id="199649"  retired="0"  datatype_id="2"  class_id="1"  is_set="0"  creator="1"  date_created="2025-06-30 12:19:10"   changed_by="1"  date_changed="2025-06-30 12:19:10"  uuid="65a87964-1946-46bf-8310-5a1183b13717"/>
+        <concept  concept_id="199650"  retired="0"  datatype_id="2"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:21:00"  changed_by="1"  date_changed="2025-06-30 12:21:00"  uuid="5f078989-6c96-43c7-b790-5674088571ac"/>
+        <concept  concept_id="199651"  retired="0"  datatype_id="2"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:22:19"  changed_by="1"  date_changed="2025-06-30 12:22:19"  uuid="642afc3b-2ac3-49f8-8418-4c9907e850ae"/>
+        <concept  concept_id="199652"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:23:29"  changed_by="1"  date_changed="2025-06-30 12:23:29"  uuid="b07f5c69-6514-44fc-951a-b77ba512765c"/>
+        <concept  concept_id="199653"  retired="0"  datatype_id="2"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:24:34"  changed_by="1"  date_changed="2025-06-30 12:37:35"  uuid="a4418367-97f0-40e2-aec1-f93c500d52f3"/>
+        <concept  concept_id="199654"  retired="0"  datatype_id="3"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:24:57"  changed_by="1"  date_changed="2025-06-30 12:24:57"  uuid="34c5f198-9134-4b31-bc69-b27442313a25"/>
+        <concept  concept_id="199655"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:25:57"  changed_by="1"  date_changed="2025-06-30 12:25:57"  uuid="07b01959-749b-4ffb-a8ac-b859f6fa79f9"/>
+        <concept  concept_id="199656"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:36:09"  changed_by="1"  date_changed="2025-06-30 12:36:09"  uuid="7c3b7c88-8152-4dd9-8b7f-2855bb289760"/>
+        <concept  concept_id="199657"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:36:51"  changed_by="1"  date_changed="2025-06-30 12:36:51"  uuid="e33ce9b6-f3fb-47c7-9701-4314de379891"/>
+        <concept  concept_id="199658"  retired="0"  datatype_id="6"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:37:49"  changed_by="1"  date_changed="2025-06-30 12:37:49"  uuid="3c926066-d9b8-460b-9dc8-e18eb4fbc876"/>
+        <concept  concept_id="199659"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:40:54"  changed_by="1"  date_changed="2025-06-30 12:40:54"  uuid="e47dbba0-78de-4dd7-977c-2916c430d0f7"/>
+        <concept  concept_id="199660"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:41:14"  changed_by="1"  date_changed="2025-06-30 12:41:14"  uuid="94620530-7a88-4b0d-abc0-9e16260bd7bc"/>
+        <concept  concept_id="199661"  retired="0"  datatype_id="3"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:41:59"  changed_by="1"  date_changed="2025-06-30 12:41:59"  uuid="f82c1618-93d6-4c58-a2c3-b4872cf144ad"/>
+        <concept  concept_id="199662"  retired="0"  datatype_id="2"  class_id="11"  is_set="0"  creator="1"  date_created="2025-06-30 12:43:07"  changed_by="1"  date_changed="2025-06-30 12:43:07"  uuid="070445ca-847e-49b6-9424-e0c429a8971e"/>
+
+        <concept  concept_id="199663"  retired="0"  datatype_id="3"  class_id="11"  is_set="0"  creator="1"  date_created="2025-07-01 10:38:28"  changed_by="1"  date_changed="2025-07-01 10:38:27"  uuid="5fffecdc-d0ad-40a9-b862-dd618079677f"/>
+        <concept  concept_id="199664"  retired="0"  datatype_id="2"  class_id="11"  is_set="0"  creator="1"  date_created="2025-07-01 10:41:32"  changed_by="1"  date_changed="2025-07-01 10:41:32"  uuid="c3a62ca3-3810-4833-82b6-17f164b1ee09"/>
+        <concept  concept_id="199665"  retired="0"  datatype_id="3"  class_id="11"  is_set="0"  creator="1"  date_created="2025-07-01 10:42:37"  changed_by="1"  date_changed="2025-07-01 10:42:37"  uuid="583537a4-9876-4560-a66e-1a62ec672658"/>
 </dataset>
diff --git a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Answer.xml b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Answer.xml
index d0c6f45b4..08a3ee3d5 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Answer.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Answer.xml
@@ -645,4 +645,62 @@
     <concept_answer  concept_answer_id="7375939"  concept_id="199550"  answer_concept="199549"  creator="1"  date_created="2025-06-24 11:19:57"  sort_weight="5"  uuid="8af3c898-a22a-4bf9-b45d-f4b470f09ae4"/>
     <concept_answer  concept_answer_id="7375940"  concept_id="199550"  answer_concept="199547"  creator="1"  date_created="2025-06-24 11:19:57"  sort_weight="3"  uuid="0ad0bb7a-b842-4622-b8ff-b5adc0067a97"/>
 
+    <concept_answer  concept_answer_id="7375941"  concept_id="199621"  answer_concept="166506"   creator="1"  date_created="2025-06-30 11:49:18"  sort_weight="1"  uuid="afa79530-18fe-467c-9312-3ec0e2bfc513"/>
+    <concept_answer  concept_answer_id="7375942"  concept_id="199621"  answer_concept="199620"   creator="1"  date_created="2025-06-30 11:49:19"  sort_weight="2"  uuid="e8080b13-aa8a-4cc0-9b28-fd8c67e019d4"/>
+    <concept_answer  concept_answer_id="7375943"  concept_id="199628"  answer_concept="199625"   creator="1"  date_created="2025-06-30 11:54:33"  sort_weight="4"  uuid="5b0ff010-9416-4b09-81fb-ebcb35a43ac3"/>
+    <concept_answer  concept_answer_id="7375944"  concept_id="199628"  answer_concept="199624"   creator="1"  date_created="2025-06-30 11:54:33"  sort_weight="3"  uuid="6748fa79-1cf1-485a-996e-1fb5db7a8c40"/>
+    <concept_answer  concept_answer_id="7375945"  concept_id="199628"  answer_concept="199623"   creator="1"  date_created="2025-06-30 11:54:33"  sort_weight="2"  uuid="d925bc55-b54c-4857-9355-bcbbef682f42"/>
+    <concept_answer  concept_answer_id="7375946"  concept_id="199628"  answer_concept="199622"   creator="1"  date_created="2025-06-30 11:54:33"  sort_weight="1"  uuid="8414cb55-5377-4d6d-a3e9-2723f4936982"/>
+    <concept_answer  concept_answer_id="7375947"  concept_id="199628"  answer_concept="99055"    creator="1"  date_created="2025-06-30 11:54:33"  sort_weight="5"  uuid="8515481a-923a-4afa-8a4f-37ad7567730d"/>
+    <concept_answer  concept_answer_id="7375948"  concept_id="199628"  answer_concept="165827"   creator="1"  date_created="2025-06-30 11:54:33"  sort_weight="6"  uuid="3403ae3b-81c7-49a9-bc50-28fa3a133f0b"/>
+    <concept_answer  concept_answer_id="7375949"  concept_id="199628"  answer_concept="199626"   creator="1"  date_created="2025-06-30 11:54:33"  sort_weight="8"  uuid="62f2ec11-3368-4585-be3e-c662beffdc94"/>
+    <concept_answer  concept_answer_id="7375950"  concept_id="199628"  answer_concept="199627"   creator="1"  date_created="2025-06-30 11:54:33"  sort_weight="9"  uuid="5860d9b4-75df-4ecc-8093-886f1bc66d97"/>
+    <concept_answer  concept_answer_id="7375951"  concept_id="199628"  answer_concept="5618"     creator="1"  date_created="2025-06-30 11:54:33"  sort_weight="7"  uuid="36c42acf-2621-4a22-857b-351dfe464658"/>
+    <concept_answer  concept_answer_id="7375952"  concept_id="199635"  answer_concept="199634"   creator="1"  date_created="2025-06-30 12:02:00"  sort_weight="3"  uuid="4b7d713f-c3ad-4078-b0e8-234b3d8d52f1"/>
+    <concept_answer  concept_answer_id="7375953"  concept_id="199635"  answer_concept="199632"   creator="1"  date_created="2025-06-30 12:02:00"  sort_weight="1"  uuid="76c964db-d002-40b8-b071-bc20996ae80a"/>
+    <concept_answer  concept_answer_id="7375954"  concept_id="199635"  answer_concept="199633"   creator="1"  date_created="2025-06-30 12:02:00"  sort_weight="2"  uuid="9871f018-5316-4aad-b7f3-d82f71fb770c"/>
+    <concept_answer  concept_answer_id="7375955"  concept_id="199635"  answer_concept="90002"    creator="1"  date_created="2025-06-30 12:02:00"  sort_weight="4"  uuid="e970f321-0234-46f6-a8e1-88cd28f69339"/>
+    <concept_answer  concept_answer_id="7375956"  concept_id="199636"  answer_concept="168637"   creator="1"  date_created="2025-06-30 12:03:26"  sort_weight="2"  uuid="992c8f05-7a2b-41ba-840f-9acfa767b496"/>
+    <concept_answer  concept_answer_id="7375957"  concept_id="199636"  answer_concept="168638"   creator="1"  date_created="2025-06-30 12:03:26"  sort_weight="3"  uuid="7e03f585-b2fb-45b1-802a-9dcd3ca5f04b"/>
+    <concept_answer  concept_answer_id="7375958"  concept_id="199636"  answer_concept="168636"   creator="1"  date_created="2025-06-30 12:03:26"  sort_weight="1"  uuid="bb9ee501-b5a6-4593-8219-5a272d4cc5c9"/>
+    <concept_answer  concept_answer_id="7375959"  concept_id="199638"  answer_concept="162558"   creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="4"  uuid="5045bf10-f648-4ea3-a4f0-c2fa79600fa6"/>
+    <concept_answer  concept_answer_id="7375960"  concept_id="199638"  answer_concept="160666"   creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="3"  uuid="a367b363-8b6f-418c-b21c-9ee38685258a"/>
+    <concept_answer  concept_answer_id="7375961"  concept_id="199638"  answer_concept="90041"    creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="10"  uuid="2f634a40-d42c-4d45-ab02-f0fc2231b2e0"/>
+    <concept_answer  concept_answer_id="7375962"  concept_id="199638"  answer_concept="99601"    creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="2"  uuid="c3557d4c-8d87-4747-bbe6-5d8cbdb4485f"/>
+    <concept_answer  concept_answer_id="7375963"  concept_id="199638"  answer_concept="165126"   creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="8"  uuid="4930dda2-2ad4-45c2-b23b-41e5617c0564"/>
+    <concept_answer  concept_answer_id="7375964"  concept_id="199638"  answer_concept="159674"   creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="5"  uuid="21d50858-09e3-40cc-99fb-e54e15ee0d5c"/>
+    <concept_answer  concept_answer_id="7375965"  concept_id="199638"  answer_concept="162277"   creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="6"  uuid="2722ab33-df7b-4c87-941b-ce21a261f6df"/>
+    <concept_answer  concept_answer_id="7375966"  concept_id="199638"  answer_concept="166462"   creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="9"  uuid="44effcaf-4edf-40e8-9a73-4f2387ad8877"/>
+    <concept_answer  concept_answer_id="7375967"  concept_id="199638"  answer_concept="162198"   creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="7"  uuid="ec926e3e-8c15-4d0a-802b-4f0729d32508"/>
+    <concept_answer  concept_answer_id="7375968"  concept_id="199638"  answer_concept="165127"   creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="11"  uuid="c1edf6dd-33da-40f8-8580-8cd884c835af"/>
+    <concept_answer  concept_answer_id="7375969"  concept_id="199638"  answer_concept="90002"    creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="13"  uuid="a91c4924-e2af-4f1e-980b-dd709d6a3c0b"/>
+    <concept_answer  concept_answer_id="7375970"  concept_id="199638"  answer_concept="165132"   creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="1"  uuid="57fc3630-9ddd-4a8b-b75f-16ebafbd9794"/>
+    <concept_answer  concept_answer_id="7375971"  concept_id="199638"  answer_concept="165125"   creator="1"  date_created="2025-06-30 12:07:29"  sort_weight="12"  uuid="36e2df5a-9f21-4ab8-ad52-663fd9e95460"/>
+    <concept_answer  concept_answer_id="7375972"  concept_id="199643"  answer_concept="168727"   creator="1"  date_created="2025-06-30 12:12:50"  sort_weight="3"  uuid="e1e76045-67bc-4438-be82-2173fc2c493f"/>
+    <concept_answer  concept_answer_id="7375973"  concept_id="199643"  answer_concept="199641"   creator="1"  date_created="2025-06-30 12:12:50"  sort_weight="1"  uuid="383fb4a8-655d-4e8c-ba7f-5b80cd88eeb6"/>
+    <concept_answer  concept_answer_id="7375974"  concept_id="199643"  answer_concept="199642"   creator="1"  date_created="2025-06-30 12:12:50"  sort_weight="2"  uuid="5a9358f1-117d-4ffb-ac04-f231edb3e8db"/>
+    <concept_answer  concept_answer_id="7375975"  concept_id="199649"  answer_concept="199648"   creator="1"  date_created="2025-06-30 12:19:10"  sort_weight="3"  uuid="33a46d93-91e4-486e-924b-0e6e1f7e4169"/>
+    <concept_answer  concept_answer_id="7375976"  concept_id="199649"  answer_concept="199645"   creator="1"  date_created="2025-06-30 12:19:10"  sort_weight="4"  uuid="41e42a72-2441-492b-a46b-5777a339b28b"/>
+    <concept_answer  concept_answer_id="7375977"  concept_id="199649"  answer_concept="199647"   creator="1"  date_created="2025-06-30 12:19:10"  sort_weight="2"  uuid="3db73708-dfa1-4cbe-966c-4928b6b74bea"/>
+    <concept_answer  concept_answer_id="7375978"  concept_id="199649"  answer_concept="199646"   creator="1"  date_created="2025-06-30 12:19:10"  sort_weight="1"  uuid="2fa31661-20c8-4003-9d42-0a9fe615f837"/>
+    <concept_answer  concept_answer_id="7375979"  concept_id="199650"  answer_concept="1065"     creator="1"  date_created="2025-06-30 12:21:00"  sort_weight="1"  uuid="57b7263f-4f47-4697-963c-1f8f1f9ea50d"/>
+    <concept_answer  concept_answer_id="7375980"  concept_id="199650"  answer_concept="1066"     creator="1"  date_created="2025-06-30 12:21:00"  sort_weight="2"  uuid="847c5cab-0720-4edf-aaae-23e124840d2c"/>
+    <concept_answer  concept_answer_id="7375981"  concept_id="199651"  answer_concept="168637"   creator="1"  date_created="2025-06-30 12:22:19"  sort_weight="2"  uuid="40dfee23-08bf-4e2e-bec7-84068ef27744"/>
+    <concept_answer  concept_answer_id="7375982"  concept_id="199651"  answer_concept="168636"   creator="1"  date_created="2025-06-30 12:22:19"  sort_weight="1"  uuid="bd0ab65b-690e-4bae-959d-73eb0792a6fc"/>
+    <concept_answer  concept_answer_id="7375983"  concept_id="199651"  answer_concept="168638"   creator="1"  date_created="2025-06-30 12:22:19"  sort_weight="3"  uuid="ac5382b2-2a7f-4248-b2fd-07a700857a46"/>
+    <concept_answer  concept_answer_id="7375984"  concept_id="199653"  answer_concept="199652"   creator="1"  date_created="2025-06-30 12:24:34"  sort_weight="1"  uuid="a98a9abe-7416-463e-a976-268bdb4746d8"/>
+    <concept_answer  concept_answer_id="7375985"  concept_id="199653"  answer_concept="165103"   creator="1"  date_created="2025-06-30 12:24:34"  sort_weight="2"  uuid="55a71b31-3fb7-422d-b7ec-8c06cd9873a7"/>
+    <concept_answer  concept_answer_id="7375986"  concept_id="199653"  answer_concept="90002"    creator="1"  date_created="2025-06-30 12:24:34"  sort_weight="5"  uuid="8a6c07a5-350e-478f-9236-7339a856910d"/>
+    <concept_answer  concept_answer_id="7375992"  concept_id="199662"  answer_concept="1066"     creator="1"  date_created="2025-06-30 12:43:07"  sort_weight="2"  uuid="496fff5a-a548-492b-b7a6-2b93382c370a"/>
+    <concept_answer  concept_answer_id="7375993"  concept_id="199662"  answer_concept="1065"     creator="1"  date_created="2025-06-30 12:43:07"  sort_weight="1"  uuid="05319d55-460b-4173-b356-73e8c6de4bee"/>
+    <concept_answer  concept_answer_id="7375994"  concept_id="166667"  answer_concept="199659"   creator="1"  date_created="2025-06-30 12:47:09"  sort_weight="8"  uuid="d46108b1-7297-40a1-9bbd-18b94b383fee"/>
+    <concept_answer  concept_answer_id="7375995"  concept_id="166667"  answer_concept="199660"   creator="1"  date_created="2025-06-30 12:47:09"  sort_weight="9"  uuid="bdc7c5ad-d9b2-45bc-bb09-33f076028239"/>
+    <concept_answer  concept_answer_id="7375996"  concept_id="166667"  answer_concept="90002"    creator="1"  date_created="2025-06-30 12:47:09"  sort_weight="10"  uuid="97c21213-d95d-461c-b12b-8afbc8167eab"/>
+
+    <concept_answer  concept_answer_id="7375997"  concept_id="199664"  answer_concept="199657"  creator="1"  date_created="2025-07-01 10:41:32"  sort_weight="5"  uuid="5f429713-13bc-4aac-85c9-1c24d0c26c34"/>
+    <concept_answer  concept_answer_id="7375998"  concept_id="199664"  answer_concept="166669"  creator="1"  date_created="2025-07-01 10:41:32"  sort_weight="2"  uuid="388018d4-1525-4c0a-bc07-f3893d8accd0"/>
+    <concept_answer  concept_answer_id="7375999"  concept_id="199664"  answer_concept="199656"  creator="1"  date_created="2025-07-01 10:41:32"  sort_weight="4"  uuid="dbf2f7f1-d4dc-487a-8776-10e6c5bfd0a6"/>
+    <concept_answer  concept_answer_id="7376000"  concept_id="199664"  answer_concept="90002"   creator="1"  date_created="2025-07-01 10:41:32"  sort_weight="6"  uuid="550c879a-bc8b-476b-af1b-5006b811cb67"/>
+    <concept_answer  concept_answer_id="7376001"  concept_id="199664"  answer_concept="199655"  creator="1"  date_created="2025-07-01 10:41:32"  sort_weight="1"  uuid="bcfdee98-2bb9-4251-963c-feb9ebc6a0ac"/>
+    <concept_answer  concept_answer_id="7376002"  concept_id="199664"  answer_concept="166670"  creator="1"  date_created="2025-07-01 10:41:32"  sort_weight="3"  uuid="4672aebf-251f-4689-bbca-d33417344f9f"/>
 </dataset>
diff --git a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Name.xml b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Name.xml
index a8875e4a8..e1098979d 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Name.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Name.xml
@@ -689,4 +689,51 @@
     <concept_name  concept_name_id="199619"  concept_id="199618"  name="Clavicle X-Ray"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-24 14:29:48"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="1bfca82c-7855-4c6d-b48d-6fc64264f654"/>
     <concept_name  concept_name_id="199620"  concept_id="199619"  name="Wrist"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-24 14:30:45"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="96e0e7af-27d0-4648-8433-fc7b6a255efe"/>
 
+    <concept_name  concept_name_id="199621"  concept_id="199620"  name="Index Client"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:48:18"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="3f3f8947-e490-4e14-aab5-0143d2b2e5e9" />
+    <concept_name  concept_name_id="199622"  concept_id="199621"  name="Index/Recruiter Category"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:49:18"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="da624c11-616f-4e72-8738-ad484c1b1f01" />
+    <concept_name  concept_name_id="199623"  concept_id="199622"  name="Newly identified HIV positive including those on ART for less than 6 months"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:49:48"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="ccbb8033-8e57-434c-927b-172461849927" />
+    <concept_name  concept_name_id="199624"  concept_id="199623"  name="Already on ART for more than six months but not virally suppressed"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:50:18"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="998d97cd-a287-412e-861b-7f8632b0aebc" />
+    <concept_name  concept_name_id="199625"  concept_id="199624"  name="PLHIV on ART with an identified risk"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:51:15"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="16def2ca-c1a6-4e47-addf-d884ebc0883a" />
+    <concept_name  concept_name_id="199626"  concept_id="199625"  name="Child of HIV Positive client"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:51:37"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="3882b623-084e-494c-afd1-be151cc8eb35" />
+    <concept_name  concept_name_id="199627"  concept_id="199626"  name="Workmate"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:53:45"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="224c0135-2278-45cd-89cf-ca0aa4430932" />
+    <concept_name  concept_name_id="199628"  concept_id="199627"  name="Social group member"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:54:14"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="2bc9c26a-d639-4f19-9bfa-6bc67f13df71" />
+    <concept_name  concept_name_id="199629"  concept_id="199628"  name="Type of contact"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:54:33"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="84b92ab3-a812-4bd0-855b-8c4be3c143ea" />
+    <concept_name  concept_name_id="199630"  concept_id="199629"  name="Other reason why at risk"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:58:07"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="13e43951-04cf-4ca6-b049-54e9c858b178" />
+    <concept_name  concept_name_id="199631"  concept_id="199630"  name="Number of social contact"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:59:02"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="53efe083-b3f4-457b-bd63-f47b70edf2ae" />
+    <concept_name  concept_name_id="199632"  concept_id="199631"  name="Number of PWID contact"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:59:30"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="14514265-66f8-48c1-9c5a-55fbbe086333" />
+    <concept_name  concept_name_id="199633"  concept_id="199632"  name="Sexual History"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 11:59:55"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="d7d5342f-8fdd-4757-88bd-caa9a33fc8be" />
+    <concept_name  concept_name_id="199634"  concept_id="199633"  name="Physical Presentation"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:00:22"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="291cef89-dc66-4d79-81bf-49dd8b257ba6" />
+    <concept_name  concept_name_id="199635"  concept_id="199634"  name="Lifestyle"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:00:42"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="6c8c3aa1-4da6-42da-9dc9-af9bfc51d499" />
+    <concept_name  concept_name_id="199636"  concept_id="199635"  name="Reasons why at Risk"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:02:00"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="3ca5e903-c31b-4fd3-a468-e3ff7d3c5c4f" />
+    <concept_name  concept_name_id="199637"  concept_id="199636"  name="Attempt made to reach index/recuriter"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:03:26"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="213331a5-4338-495a-936f-efa0a90442fd" />
+    <concept_name  concept_name_id="199638"  concept_id="199637"  name="Date index/recruiter reached"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:03:44"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="b00574d1-2967-4bf2-b527-42e24af48a36" />
+    <concept_name  concept_name_id="199639"  concept_id="199638"  name="Contact Category"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:07:29"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="a341c41a-d5a6-489b-9265-e658ee3a3f46" />
+    <concept_name  concept_name_id="199640"  concept_id="199639"  name="Other contact category"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:07:55"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="c25e08c7-9a79-4eb5-9cad-a8f4b61c6187" />
+    <concept_name  concept_name_id="199641"  concept_id="199640"  name="Contact age"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:08:30"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="8bad79a3-2565-4f0e-b80f-53faa5166573" />
+    <concept_name  concept_name_id="199642"  concept_id="199641"  name="Accepted"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:10:49"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="98eab7bc-08dc-4980-9a46-43285e5e8987" />
+    <concept_name  concept_name_id="199643"  concept_id="199642"  name="Decline"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:11:16"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="7408dc9c-e933-4930-aae0-ddcf9236201e" />
+    <concept_name  concept_name_id="199644"  concept_id="199643"  name="Encounter outcome"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:12:50"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="a0a17aa0-3eed-4727-9e77-1ffed3ffd304" />
+    <concept_name  concept_name_id="199645"  concept_id="199644"  name="Contact current place of residence"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:15:05"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="99ec31e8-cc8f-498a-b765-1dac7b392ae3" />
+    <concept_name  concept_name_id="199646"  concept_id="199645"  name="Dual Referral"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:16:08"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="f6fc65f7-07c4-4bf6-bfad-5084ac0839f2" />
+    <concept_name  concept_name_id="199647"  concept_id="199646"  name="Provider Referral"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:16:18"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="ec90820f-23a3-4656-a789-d29c6acce79b" />
+    <concept_name  concept_name_id="199648"  concept_id="199647"  name="Client Referral"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:16:42"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="474ffb13-04a6-459e-9cdd-948dc9256821" />
+    <concept_name  concept_name_id="199649"  concept_id="199648"  name="Contact Referral"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:17:47"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="6f0784a1-c368-49d4-a33f-7cb2b8f95ba8" />
+    <concept_name  concept_name_id="199650"  concept_id="199649"  name="Contact Notification Method"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:19:10"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="103aa5aa-a52f-4ebe-a950-069c8e2b5cc0" />
+    <concept_name  concept_name_id="199651"  concept_id="199650"  name="History of Contact/Recruiter Violence"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:21:00"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="cfa92132-9a0e-456a-889d-d888a1a946df" />
+    <concept_name  concept_name_id="199652"  concept_id="199651"  name="Attempt made to reach contact"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:22:19"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="9f1b1cee-b9ae-4447-b6ac-fb22a82cebec" />
+    <concept_name  concept_name_id="199653"  concept_id="199652"  name="Phone Call"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:23:29"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="961abbf6-476d-43b5-bfbb-91fc09b31ed9" />
+    <concept_name  concept_name_id="199654"  concept_id="199653"  name="Contact Encounter Means"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:24:34"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="106d062d-a1ee-47b0-9003-8a4b6ce8bfd9"  date_changed="2025-06-30 12:37:35"  changed_by="1"/>
+    <concept_name  concept_name_id="199655"  concept_id="199654"  name="Other contact encounter means"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:24:57"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="65c88d81-23a5-4807-a0a3-ca52f23ef0dd" />
+    <concept_name  concept_name_id="199656"  concept_id="199655"  name="Came for HIV test"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:25:57"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="97698721-06d6-4246-8049-b041d08e15f9" />
+    <concept_name  concept_name_id="199657"  concept_id="199656"  name="Known HIV Positive"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:36:09"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="30f333b0-a633-413d-aa0c-452c7818d732" />
+    <concept_name  concept_name_id="199658"  concept_id="199657"  name="Documented HIV negative results (for previous four weeks)"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:36:51"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="fbfabaaf-e794-4f1b-8b56-be29622dafc9" />
+    <concept_name  concept_name_id="199659"  concept_id="199658"  name="Contact encounter date"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:37:49"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="21be3925-ef7c-4782-a6d9-b8236b84ee47" />
+    <concept_name  concept_name_id="199660"  concept_id="199659"  name="Contact has tested for HIV"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:40:54"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="25e480c0-34f0-4273-afd3-079cceae812e" />
+    <concept_name  concept_name_id="199661"  concept_id="199660"  name="Contact is confirmed to be already in HIV Care"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:41:14"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="f1b6eeb9-8aee-4e74-bb94-4f45902d0783" />
+    <concept_name  concept_name_id="199662"  concept_id="199661"  name="Other case closure status"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:41:59"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="910eedc9-b4c1-4985-aacc-1ee9b9fd7033" />
+    <concept_name  concept_name_id="199663"  concept_id="199662"  name="Experienced violence within one month post notification"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-06-30 12:43:07"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="a2360ce1-411e-4dac-b98b-89fa0c1f332a" />
+
+    <concept_name  concept_name_id="199664"  concept_id="199663"  name="Contact Number"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-07-01 10:38:28"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="274d3000-9012-46c5-a4a7-fbf1cd3cf748" />
+    <concept_name  concept_name_id="199665"  concept_id="199664"  name="Contact Encounter Outcome"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-07-01 10:41:32"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="cf4d7296-3f81-4ea3-8669-8bf5cc050d12" />
+    <concept_name  concept_name_id="199666"  concept_id="199665"  name="Other contact encounter outcome"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-07-01 10:42:37"  concept_name_type="FULLY_SPECIFIED"  voided="0"   uuid="46b9f21d-4bcd-4d5d-9cc3-e0873782f4ab" />
 </dataset>
diff --git a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Numeric.xml b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Numeric.xml
index c42accabf..40ce161e4 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Numeric.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Numeric.xml
@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <dataset>
-
+    <concept_numeric  concept_id="199640" allow_decimal="1"/>
 </dataset>
\ No newline at end of file