diff --git a/src/main/resources/db/demo-data/referencedata.facility_type_approved_products.csv b/src/main/resources/db/demo-data/referencedata.facility_type_approved_products.csv
index 790e25a6..7b6e1960 100644
--- a/src/main/resources/db/demo-data/referencedata.facility_type_approved_products.csv
+++ b/src/main/resources/db/demo-data/referencedata.facility_type_approved_products.csv
@@ -20282,4 +20282,13 @@ e939905e-619b-4e8e-ab09-14edbb822af5,1,ac1d268b-ce10-455f-bf87-9c667da8f060,8a0c
 f48234e4-a797-403c-a519-b3aa0f3ffc16,1,ac1d268b-ce10-455f-bf87-9c667da8f060,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,5beb647f-6f7b-4092-a941-2ca95c90e274,3,1.5,1,true
 d904b0f5-70eb-4f24-8995-c937e76459ec,1,ac1d268b-ce10-455f-bf87-9c667da8f060,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,ad243ca7-6eee-4e30-8472-b359afe4b42a,3,1.5,1,true
 c4848541-f160-4428-8ba1-99627748b485,1,ac1d268b-ce10-455f-bf87-9c667da8f060,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,be9546f3-0c42-4735-a670-738c5e25aa37,3,1.5,1,true
-3706302a-3b34-432c-bbed-58caf3701900,1,ac1d268b-ce10-455f-bf87-9c667da8f060,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,9b0ede96-c4e6-4427-90d4-30c8cb0fe806,3,1.5,1,true
\ No newline at end of file
+3706302a-3b34-432c-bbed-58caf3701900,1,ac1d268b-ce10-455f-bf87-9c667da8f060,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,9b0ede96-c4e6-4427-90d4-30c8cb0fe806,3,1.5,1,true
+ecce57ea-990f-4d2c-adcb-1058df420a35,1,ac1d268b-ce10-455f-bf87-9c667da8f060,5a666ff8-5d87-477e-8109-42f6ac666eb1,b9a78ade-0c02-474a-a28a-bf7cdd82c9ae,3,1.5,1,true
+538d6052-bffd-4c85-a5e6-52871faeb9dc,1,ac1d268b-ce10-455f-bf87-9c667da8f060,5a666ff8-5d87-477e-8109-42f6ac666eb1,2d291519-40fe-4b3c-9140-16656e9b7970,3,1.5,1,true
+6ed95894-3c4f-469a-8094-cf81966d3d88,1,ac1d268b-ce10-455f-bf87-9c667da8f060,5a666ff8-5d87-477e-8109-42f6ac666eb1,ed805077-200a-43f1-9135-fd0a2ec9d95e,3,1.5,1,true
+ce30d736-a17f-40c1-91ca-6ddde4d2a3ff,1,ac1d268b-ce10-455f-bf87-9c667da8f060,5a666ff8-5d87-477e-8109-42f6ac666eb1,3f42052f-5155-4d12-bc45-27b7f52faac9,3,1.5,1,true
+8dd10f34-4810-43a4-9192-82385dc5e24c,1,ac1d268b-ce10-455f-bf87-9c667da8f060,5a666ff8-5d87-477e-8109-42f6ac666eb1,0c6142a0-c58f-438d-b2f1-9609d31ce25a,3,1.5,1,true
+88183d6b-7429-4a98-a5e3-24a45d3c56c5,1,ac1d268b-ce10-455f-bf87-9c667da8f060,5a666ff8-5d87-477e-8109-42f6ac666eb1,fc0e4a00-54cc-4f6f-8577-339169d35726,3,1.5,1,true
+4cadf38c-f647-4518-adbb-d5810a8290f0,1,ac1d268b-ce10-455f-bf87-9c667da8f060,5a666ff8-5d87-477e-8109-42f6ac666eb1,23da892e-3dcf-481c-9664-1a861fbed6b9,3,1.5,1,true
+a3539619-9ecb-41e3-9d89-7b1ae28d6dfe,1,ac1d268b-ce10-455f-bf87-9c667da8f060,5a666ff8-5d87-477e-8109-42f6ac666eb1,86584b78-d860-4b5c-b362-7228d380b129,3,1.5,1,true
+69fc663e-7c6b-4d88-994b-7f1ef6ff87de,1,ac1d268b-ce10-455f-bf87-9c667da8f060,5a666ff8-5d87-477e-8109-42f6ac666eb1,e4d20c19-0774-4183-ade4-48297274b41d,3,1.5,1,true
diff --git a/src/main/resources/db/demo-data/referencedata.orderable_display_categories.csv b/src/main/resources/db/demo-data/referencedata.orderable_display_categories.csv
index 2d03864b..0b2e7b14 100644
--- a/src/main/resources/db/demo-data/referencedata.orderable_display_categories.csv
+++ b/src/main/resources/db/demo-data/referencedata.orderable_display_categories.csv
@@ -10,3 +10,4 @@ baeb2434-574d-4804-9640-992abbe826ef,C3,Anti-fungal,3
 74f39ab7-b5ce-4087-a6ea-65799a35e79b,inj,Injectable hormonal contraceptive,9
 1b59c74f-d087-4911-8bc1-5eaa9235730a,arv,Antiretroviral,10
 4b88f5bb-cad6-4206-a5b3-4b994759851d,lab,Lab,11
+98d1a86b-0d05-4101-b1ca-dfa9006768a7,TB,Anti-TB,12
diff --git a/src/main/resources/db/demo-data/referencedata.orderables.csv b/src/main/resources/db/demo-data/referencedata.orderables.csv
index 5edb9599..7f1c830b 100644
--- a/src/main/resources/db/demo-data/referencedata.orderables.csv
+++ b/src/main/resources/db/demo-data/referencedata.orderables.csv
@@ -10224,3 +10224,12 @@ bd2eafc3-0850-46c1-b395-41c9950d2244,LAB147,ffd57abe-a891-4f59-a66b-2ad3de0f809c
 ad243ca7-6eee-4e30-8472-b359afe4b42a,LAB149,ffd57abe-a891-4f59-a66b-2ad3de0f809c,Amikacin sulfate salt,5,3,false,Demo Lab Product,,1
 be9546f3-0c42-4735-a670-738c5e25aa37,LAB150,ffd57abe-a891-4f59-a66b-2ad3de0f809c,Ofloxacin,1,1,false,Demo Lab Product,,1
 9b0ede96-c4e6-4427-90d4-30c8cb0fe806,LAB151,ffd57abe-a891-4f59-a66b-2ad3de0f809c,"DBS, 903, Whatman Simple Screening card, Perforated spots, 5 x .5in spots per card(x100)",100,50,false,Demo Lab Product,,1
+b9a78ade-0c02-474a-a28a-bf7cdd82c9ae,10010510AE,b659c6aa-37ad-4cb9-bf76-7e6669c04fed,Rifampicin + Isoniazid + Pyrazinamide + Ethambutol Hydrochloride (RHZE) Tablet 150/75/400/275 mg,5,2,false,,,1
+2d291519-40fe-4b3c-9140-16656e9b7970,10010508AE,b659c6aa-37ad-4cb9-bf76-7e6669c04fed,Rifampicin + Isoniazid (RH) Tablet 150 + 75 mg/mg,5,2,false,,,1
+ed805077-200a-43f1-9135-fd0a2ec9d95e,10010110AE,b659c6aa-37ad-4cb9-bf76-7e6669c04fed,MB BLISTER ADULT Tablet - -,5,2,false,,,1
+3f42052f-5155-4d12-bc45-27b7f52faac9,10010515AE,b659c6aa-37ad-4cb9-bf76-7e6669c04fed,Rifampicin+INH+Pyraz (RHZ) Tablet 75+50+150 mg,5,2,false,,,1
+0c6142a0-c58f-438d-b2f1-9609d31ce25a,10010233AE,b659c6aa-37ad-4cb9-bf76-7e6669c04fed,Ethambutol Tablet 100 mg,5,2,false,,,1
+fc0e4a00-54cc-4f6f-8577-339169d35726,10010514AE,b659c6aa-37ad-4cb9-bf76-7e6669c04fed,Rifampicin+INH (RH) Tablet 75+50 mg,5,2,false,,,1
+23da892e-3dcf-481c-9664-1a861fbed6b9,10010113AE,b659c6aa-37ad-4cb9-bf76-7e6669c04fed,MB BLISTER CHILD Tablet - -,5,2,false,,,1
+86584b78-d860-4b5c-b362-7228d380b129,10010114AE,b659c6aa-37ad-4cb9-bf76-7e6669c04fed,ISONIAZID BP 100MG TABLETS Tablet 100 mg,5,2,false,,,1
+e4d20c19-0774-4183-ade4-48297274b41d,10010315AE,b659c6aa-37ad-4cb9-bf76-7e6669c04fed,Isoniazid Tablet 300 mg,5,2,false,,,1
diff --git a/src/main/resources/db/demo-data/referencedata.processing_periods.csv b/src/main/resources/db/demo-data/referencedata.processing_periods.csv
index 454469b7..699a5251 100644
--- a/src/main/resources/db/demo-data/referencedata.processing_periods.csv
+++ b/src/main/resources/db/demo-data/referencedata.processing_periods.csv
@@ -430,4 +430,6 @@ deacd7c5-72e6-41f4-a695-c636dda733b5,Apr2025,2025-04-01,2025-04-30,083775ab-b9af
 48bde5a6-02d7-4ccc-8f06-faf144b65c4a,Sep2025,2025-09-01,2025-09-30,083775ab-b9af-41a3-b845-0fbf4fe1583d,"{""reportOnly"":""false""}"
 44e5f30f-414a-4d60-913d-440bce838336,Oct2025,2025-10-01,2025-10-31,083775ab-b9af-41a3-b845-0fbf4fe1583d,"{""reportOnly"":""true""}"
 6052c033-d01e-47d5-a660-49b093114d52,Nov2025,2025-11-01,2025-11-30,083775ab-b9af-41a3-b845-0fbf4fe1583d,"{""reportOnly"":""true""}"
-a3022469-5d38-414b-b83a-0f84e5bbf4d7,Dec2025,2025-12-01,2025-12-31,083775ab-b9af-41a3-b845-0fbf4fe1583d,"{""reportOnly"":""false""}"
\ No newline at end of file
+a3022469-5d38-414b-b83a-0f84e5bbf4d7,Dec2025,2025-12-01,2025-12-31,083775ab-b9af-41a3-b845-0fbf4fe1583d,"{""reportOnly"":""false""}"
+1681f426-9cbd-4224-9c57-bdc405d460fd,July 2016 – June 2017,2016-07-01,2017-06-30,d21ba898-2bed-47ac-8ab8-9afb4a663fc9,
+bcf9b66d-3f9d-4b32-967f-0fb619fd8681,July 2017 – June 2017,2017-07-01,2018-06-30,d21ba898-2bed-47ac-8ab8-9afb4a663fc9,
diff --git a/src/main/resources/db/demo-data/referencedata.processing_schedules.csv b/src/main/resources/db/demo-data/referencedata.processing_schedules.csv
index 741df4b7..da5ca56a 100644
--- a/src/main/resources/db/demo-data/referencedata.processing_schedules.csv
+++ b/src/main/resources/db/demo-data/referencedata.processing_schedules.csv
@@ -4,3 +4,4 @@ id,code,name,modifieddate
 d036a3bc-865a-402b-972e-96e0695bf8ce,SCH003,Monthly A,2016-02-20 13:20:11
 9fca3d5d-b2c8-46c8-adb0-96e38d2c1f6f,SCH004,Monthly B,2016-04-05 16:57:06
 083775ab-b9af-41a3-b845-0fbf4fe1583d,SCH005,Monthly C,2016-04-05 16:57:06
+d21ba898-2bed-47ac-8ab8-9afb4a663fc9,BUQ,BUQ,
diff --git a/src/main/resources/db/demo-data/referencedata.program_orderables.csv b/src/main/resources/db/demo-data/referencedata.program_orderables.csv
index bf83a9e2..d6dd972a 100644
--- a/src/main/resources/db/demo-data/referencedata.program_orderables.csv
+++ b/src/main/resources/db/demo-data/referencedata.program_orderables.csv
@@ -10226,3 +10226,12 @@ c97bc7c7-a3ff-4636-94a0-fedaac42d2d4,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,fb2f24
 22ecd65a-2c43-4951-a122-d48ba93a2faa,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,ad243ca7-6eee-4e30-8472-b359afe4b42a,4b88f5bb-cad6-4206-a5b3-4b994759851d,,true,true,149,689.73,1
 09c48b30-e1e3-4f43-828f-c7c977382484,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,be9546f3-0c42-4735-a670-738c5e25aa37,4b88f5bb-cad6-4206-a5b3-4b994759851d,,true,true,150,312.39,1
 ff5b3537-073a-42f9-810a-9e03ff9643f9,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,9b0ede96-c4e6-4427-90d4-30c8cb0fe806,4b88f5bb-cad6-4206-a5b3-4b994759851d,,true,true,151,0,1
+c9c0b1a0-e918-4075-8678-5dd4f598f9e1,5a666ff8-5d87-477e-8109-42f6ac666eb1,b9a78ade-0c02-474a-a28a-bf7cdd82c9ae,98d1a86b-0d05-4101-b1ca-dfa9006768a7,112,true,true,1,3.155,1
+d7ef9985-f55c-46d1-b78f-60da86989cb2,5a666ff8-5d87-477e-8109-42f6ac666eb1,2d291519-40fe-4b3c-9140-16656e9b7970,98d1a86b-0d05-4101-b1ca-dfa9006768a7,112,true,true,1,3.155,1
+ab9f683e-59fb-4dc0-a699-b6503aa0743e,5a666ff8-5d87-477e-8109-42f6ac666eb1,ed805077-200a-43f1-9135-fd0a2ec9d95e,98d1a86b-0d05-4101-b1ca-dfa9006768a7,1,true,true,1,3.155,1
+fc836f95-65f3-4c73-bd6e-6afa73a7b010,5a666ff8-5d87-477e-8109-42f6ac666eb1,3f42052f-5155-4d12-bc45-27b7f52faac9,98d1a86b-0d05-4101-b1ca-dfa9006768a7,112,true,true,1,3.155,1
+eaddc443-561b-4dc5-abf4-724c44d2300c,5a666ff8-5d87-477e-8109-42f6ac666eb1,0c6142a0-c58f-438d-b2f1-9609d31ce25a,98d1a86b-0d05-4101-b1ca-dfa9006768a7,84,true,true,1,3.155,1
+ff23eb94-71a6-4b6e-892e-abd1356ac3bc,5a666ff8-5d87-477e-8109-42f6ac666eb1,fc0e4a00-54cc-4f6f-8577-339169d35726,98d1a86b-0d05-4101-b1ca-dfa9006768a7,112,true,true,1,3.155,1
+d03f3a9a-5f13-4eee-8656-ceaf6fa4af20,5a666ff8-5d87-477e-8109-42f6ac666eb1,23da892e-3dcf-481c-9664-1a861fbed6b9,98d1a86b-0d05-4101-b1ca-dfa9006768a7,1,true,true,1,3.155,1
+13dfeed5-8611-4b90-aaff-cfc520e570bc,5a666ff8-5d87-477e-8109-42f6ac666eb1,86584b78-d860-4b5c-b362-7228d380b129,98d1a86b-0d05-4101-b1ca-dfa9006768a7,56,true,true,1,3.155,1
+1a446e84-f6b8-4afe-b4cb-11971879affe,5a666ff8-5d87-477e-8109-42f6ac666eb1,e4d20c19-0774-4183-ade4-48297274b41d,98d1a86b-0d05-4101-b1ca-dfa9006768a7,28,true,true,1,3.155,1
diff --git a/src/main/resources/db/demo-data/referencedata.programs.csv b/src/main/resources/db/demo-data/referencedata.programs.csv
index 96c9bd85..1f0ff5b7 100644
--- a/src/main/resources/db/demo-data/referencedata.programs.csv
+++ b/src/main/resources/db/demo-data/referencedata.programs.csv
@@ -5,3 +5,5 @@ dce17f2e-af3e-40ad-8e00-3496adef44c3,PRG001,Family Planning,true,true,false,true
 418bdc1d-c303-4bd0-b2d3-d8901150a983,PRG004,EPI,true,false,true,false,false
 ef9a2b39-e7ce-4ebe-930c-f5c6d15b578a,PRG005,ARV,true,true,false,true,false
 8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,PRG006,Lab Program,true,true,false,true,false
+5a666ff8-5d87-477e-8109-42f6ac666eb1,TB Monthly,TB Monthly,true,false,false,false,false
+74978376-fb31-4cd7-adce-d57c499f2eeb,BUQ,BUQ,true,false,false,false,false
diff --git a/src/main/resources/db/demo-data/referencedata.requisition_group_program_schedules.csv b/src/main/resources/db/demo-data/referencedata.requisition_group_program_schedules.csv
index b131397b..dc3d93a1 100644
--- a/src/main/resources/db/demo-data/referencedata.requisition_group_program_schedules.csv
+++ b/src/main/resources/db/demo-data/referencedata.requisition_group_program_schedules.csv
@@ -1008,4 +1008,6 @@ ecc87ed1-4d7b-4a9f-ae41-df7318205984,10845cb9-d365-4aaa-badd-b4fa39c6a26a,057921
 a9632486-5cf1-4247-a7d0-5a0338967668,10845cb9-d365-4aaa-badd-b4fa39c6a26a,057921bd-1841-4748-8523-dbe5ebb58368,true,0bc0d169-e0d4-453e-8f32-eb110663cae6
 301b6fb6-82f0-4b98-b7b4-335ee3bc9e24,10845cb9-d365-4aaa-badd-b4fa39c6a26a,9c15bd6e-3f6b-4b91-b53a-36c199d35eac,true,fcb84e25-07a5-47e9-94ec-a90232b0858b
 30fbc3d3-2b44-4c44-a3d3-3dfa98913391,10845cb9-d365-4aaa-badd-b4fa39c6a26a,9c15bd6e-3f6b-4b91-b53a-36c199d35eac,true,8b792753-d849-429b-b8a8-182246cc6d3b
-b142e390-7e1d-47c9-be28-22e10bdc47df,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,9c15bd6e-3f6b-4b91-b53a-36c199d35eac,true,22e77f01-a4b4-436e-b387-1f444862db28
\ No newline at end of file
+b142e390-7e1d-47c9-be28-22e10bdc47df,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,9c15bd6e-3f6b-4b91-b53a-36c199d35eac,true,22e77f01-a4b4-436e-b387-1f444862db28
+e21ca6e4-b762-4a06-b8cd-8f8b3a72388c,5a666ff8-5d87-477e-8109-42f6ac666eb1,9c15bd6e-3f6b-4b91-b53a-36c199d35eac,true,1642bfd8-94e1-4fcf-80e7-254b29ca8e05
+2e0f931a-e4bf-414f-b35c-5f9ed00dc9e7,74978376-fb31-4cd7-adce-d57c499f2eeb,d21ba898-2bed-47ac-8ab8-9afb4a663fc9,true,f3ff98db-6254-4d3e-a501-01874ed4d184
diff --git a/src/main/resources/db/demo-data/referencedata.role_assignments.csv b/src/main/resources/db/demo-data/referencedata.role_assignments.csv
index 5528c0c5..b6711596 100644
--- a/src/main/resources/db/demo-data/referencedata.role_assignments.csv
+++ b/src/main/resources/db/demo-data/referencedata.role_assignments.csv
@@ -690,3 +690,11 @@ fe13b2d5-5f92-433c-9488-50e4bfbbb699,supervision,c994d1ea-47f7-435d-9d4d-42fb541
 87b8888d-ccc4-401e-a54b-b99093afe6c8,supervision,cb5cd52f-f205-475d-8763-90852839424d,b6134c01-cb37-4303-85f0-8c8eab9d3cec,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,,
 d4a1f062-f037-45af-b524-b1fc5e123a70,supervision,2bb552b3-0324-42ef-bb21-c5cc74a38592,d30a2fbb-51d9-49ad-90fe-fb405470a439,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,fb38bd1c-beeb-4527-8345-900900329c10,
 f431b7dc-c298-4c2e-a449-b1d5fc7fe5f9,supervision,247b366d-f8ab-4226-9ae9-a188d5ee8e22,5c316c50-96ad-4f04-8a3a-4f5aa8afa67e,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,,
+f5baafa8-60e7-4235-aae9-948c19e5c01f,supervision,a337ec45-31a0-4f2b-9b2e-a105c4b669bb,185db8f7-ee35-44d0-8b40-6de12489ae77,5a666ff8-5d87-477e-8109-42f6ac666eb1,fb38bd1c-beeb-4527-8345-900900329c10,
+084de753-e229-4889-8b93-8a66a0f88d23,supervision,a337ec45-31a0-4f2b-9b2e-a105c4b669bb,2c3e59f2-6630-4e6d-b98a-4ed427ed778d,5a666ff8-5d87-477e-8109-42f6ac666eb1,fb38bd1c-beeb-4527-8345-900900329c10,
+26a19293-d37e-4c27-89f4-2beb4ca552c6,supervision,a337ec45-31a0-4f2b-9b2e-a105c4b669bb,b6134c01-cb37-4303-85f0-8c8eab9d3cec,5a666ff8-5d87-477e-8109-42f6ac666eb1,fb38bd1c-beeb-4527-8345-900900329c10,
+b71e4716-8da6-4fb6-a762-6ef57c1244a6,supervision,a337ec45-31a0-4f2b-9b2e-a105c4b669bb,a4370b58-ebb3-47dd-a5ca-c20566d21aaf,74978376-fb31-4cd7-adce-d57c499f2eeb,,
+a4370b58-ebb3-47dd-a5ca-c20566d21aaf,supervision,a337ec45-31a0-4f2b-9b2e-a105c4b669bb,d7fb2ea2-ec3c-4ca6-9a02-0dc48a55a50c,74978376-fb31-4cd7-adce-d57c499f2eeb,,
+d7fb2ea2-ec3c-4ca6-9a02-0dc48a55a50c,supervision,a337ec45-31a0-4f2b-9b2e-a105c4b669bb,1ba471b3-9b2e-4aa7-835f-5af695af9567,74978376-fb31-4cd7-adce-d57c499f2eeb,6f5eae49-bc62-4664-a679-1ef0bfd5b21d,
+1ba471b3-9b2e-4aa7-835f-5af695af9567,supervision,a337ec45-31a0-4f2b-9b2e-a105c4b669bb,d4bd00db-f1e1-4ab2-bf1a-0a966d3bc4f6,74978376-fb31-4cd7-adce-d57c499f2eeb,6f5eae49-bc62-4664-a679-1ef0bfd5b21d,
+5f49c7af-61b5-4e94-aed7-89f0e3938488,direct,a337ec45-31a0-4f2b-9b2e-a105c4b669bb,5f49c7af-61b5-4e94-aed7-89f0e3938488,74978376-fb31-4cd7-adce-d57c499f2eeb,,
diff --git a/src/main/resources/db/demo-data/referencedata.role_rights.csv b/src/main/resources/db/demo-data/referencedata.role_rights.csv
index 6c6101a1..f3463186 100644
--- a/src/main/resources/db/demo-data/referencedata.role_rights.csv
+++ b/src/main/resources/db/demo-data/referencedata.role_rights.csv
@@ -27,3 +27,10 @@ e16d802b-8eb1-43f7-adf8-ef123227cb88,f0d1de5b-fdee-41ef-bcbb-eb5522b7f66a
 e16d802b-8eb1-43f7-adf8-ef123227cb88,1b0df657-c569-4b44-8236-c035ffdff667
 2c3e59f2-6630-4e6d-b98a-4ed427ed778d,d86537ce-8822-47dd-94fc-9645e7e0bfb5
 d30a2fbb-51d9-49ad-90fe-fb405470a439,d86537ce-8822-47dd-94fc-9645e7e0bfb5
+a4370b58-ebb3-47dd-a5ca-c20566d21aaf,d9af0056-adb4-4730-b9a8-5cbba26d5dbc
+d7fb2ea2-ec3c-4ca6-9a02-0dc48a55a50c,6ec0b77d-8dba-4f2b-82f4-9214036a6e7d
+d7fb2ea2-ec3c-4ca6-9a02-0dc48a55a50c,d9aa5fa0-fcb6-420c-898f-121a197d29a9
+1ba471b3-9b2e-4aa7-835f-5af695af9567,8a83b9e4-09c4-4a64-8302-fe54cef36cc9
+d4bd00db-f1e1-4ab2-bf1a-0a966d3bc4f6,28827a19-6dd2-470c-a5f4-dddabdcb50e8
+d4bd00db-f1e1-4ab2-bf1a-0a966d3bc4f6,56c5b03f-8df6-4cc9-89e1-122fd052be78
+5f49c7af-61b5-4e94-aed7-89f0e3938488,6404e247-f57c-407d-a812-cac713e444b3
diff --git a/src/main/resources/db/demo-data/referencedata.roles.csv b/src/main/resources/db/demo-data/referencedata.roles.csv
index 6a537406..2aee06bd 100644
--- a/src/main/resources/db/demo-data/referencedata.roles.csv
+++ b/src/main/resources/db/demo-data/referencedata.roles.csv
@@ -11,3 +11,8 @@ d8ff49b1-96e7-4710-9511-289f490f7577,Stock Manager,"Can view stock cards, edit s
 5c316c50-96ad-4f04-8a3a-4f5aa8afa67e,Stock Viewer,Can view stock cards.
 d835bb5b-2309-4c3e-b6d1-6315442b9f7b,CCE Inventory Manager,Can view and manage cold chain equipment.
 3aa8dfc1-ef16-4345-9924-d39cc264cd1c,CCE Inventory Viewer,Can view cold chain equipment.
+a4370b58-ebb3-47dd-a5ca-c20566d21aaf,Prepare BUQ,Can prepare the BUQ forms.
+d7fb2ea2-ec3c-4ca6-9a02-0dc48a55a50c,Create/Authorize Forecasting,Can submit and authorize the BUQ forms.
+1ba471b3-9b2e-4aa7-835f-5af695af9567,Approve BUQ,Can approve the BUQ forms on district and regional level.
+d4bd00db-f1e1-4ab2-bf1a-0a966d3bc4f6,MOH/PORALG Approvals,Can approve the BUQ forms on MOH/PORALG levels.
+5f49c7af-61b5-4e94-aed7-89f0e3938488,Manage BUQ,Can manage the BUQ administrative panel.
diff --git a/src/main/resources/db/demo-data/referencedata.supervisory_nodes.csv b/src/main/resources/db/demo-data/referencedata.supervisory_nodes.csv
index da17201d..ff741359 100644
--- a/src/main/resources/db/demo-data/referencedata.supervisory_nodes.csv
+++ b/src/main/resources/db/demo-data/referencedata.supervisory_nodes.csv
@@ -4,7 +4,7 @@ fb38bd1c-beeb-4527-8345-900900329c10,SN1,FP approval point,e6799d64-d10d-4011-b8
 05b8e2b8-2f8f-4585-99da-0e41fcc4da69,SN11.2,FP approval sub point 2,13037147-1769-4735-90a7-b9b310d128b8,fb38bd1c-beeb-4527-8345-900900329c10,,
 6d5831e7-c336-4129-bd10-0149910a72aa,SN2,EM approval point,13037147-1769-4735-90a7-b9b310d128b8,,,
 219cf7dd-b60a-4c25-ae4e-bf035f357bb4,SN-NIASSA-PROV,Niassa province approval point (EPI),0898dcd6-53f2-41b6-ba7d-b2f5122ffb44,,,
-6f5eae49-bc62-4664-a679-1ef0bfd5b21d,SN-CUAMBA-DIST,Cuamba district approval point (EPI),c62dea9b-6974-4101-ba39-b09914165967,219cf7dd-b60a-4c25-ae4e-bf035f357bb4,,
+6f5eae49-bc62-4664-a679-1ef0bfd5b21d,SN-CUAMBA-DIST,Cuamba district approval point (EPI),,219cf7dd-b60a-4c25-ae4e-bf035f357bb4,,
 dcd5566a-4400-4190-9459-602bf6d5f6f2,SN-LICHINGA-DIST,Lichinga district approval point (EPI),2b6a845a-1bc0-4208-a1a5-c2a09171d707,219cf7dd-b60a-4c25-ae4e-bf035f357bb4,,
 bc5e972d-73e9-41c9-9c49-aa260e34a911,SN-LILONGWE-DIST-ARV-1,Lilongwe district approval point (ARV),752a6979-cb5f-416b-b73b-527e2b6569c4,,,
 cf9deeee-467d-4477-958a-02e6aee1a9b5,SN-LILONGWE-DIST-ARV-1.1,Lilongwe district approval sub point (ARV),,bc5e972d-73e9-41c9-9c49-aa260e34a911,,
diff --git a/src/main/resources/db/demo-data/referencedata.supported_programs.csv b/src/main/resources/db/demo-data/referencedata.supported_programs.csv
index 02f83fd8..055b7eb7 100644
--- a/src/main/resources/db/demo-data/referencedata.supported_programs.csv
+++ b/src/main/resources/db/demo-data/referencedata.supported_programs.csv
@@ -3738,3 +3738,5 @@ e3f3a63f-823f-42e3-a55c-27406c842ec1,ef9a2b39-e7ce-4ebe-930c-f5c6d15b578a,true,2
 f085c1e1-b7cb-41f7-9903-581857983c6a,ef9a2b39-e7ce-4ebe-930c-f5c6d15b578a,true,2018-01-01,false
 bfe3eac5-9961-4d44-a492-431865bbcb23,ef9a2b39-e7ce-4ebe-930c-f5c6d15b578a,true,2018-01-01,false
 176c4276-1fb1-4507-8ad2-cdfba0f47445,8a0cf9c6-0591-4ce1-bbbb-ae55553db0dc,true,2020-01-01,true
+e6799d64-d10d-4011-b8c2-0e4d4a3f65ce,5a666ff8-5d87-477e-8109-42f6ac666eb1,true,,false
+7fc9bda8-ad8a-468d-8244-38e1918527d5,74978376-fb31-4cd7-adce-d57c499f2eeb,true,,false